From f79696df830ff08c0305148c66c1b3d6dde2746b Mon Sep 17 00:00:00 2001 From: Manuel Mauky Date: Wed, 17 Jun 2015 14:07:12 +0200 Subject: [PATCH 01/33] #272 update javadoc links in README --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e21394500..612f2fef9 100644 --- a/README.md +++ b/README.md @@ -36,9 +36,9 @@ If you need help you can use the forums on [Google Groups](https://groups.google ### Links - [Project Page](http://sialcasa.github.io/mvvmFX/) -- [javadoc mvvmfx core](http://sialcasa.github.io/mvvmFX/javadoc/1.3.0/mvvmfx/) -- [javadoc mvvmfx-cdi](http://sialcasa.github.io/mvvmFX/javadoc/1.3.0/mvvmfx-cdi/) -- [javadoc mvvmfx-guice](http://sialcasa.github.io/mvvmFX/javadoc/1.3.0/mvvmfx-guice/) -- [javadoc mvvmfx-utils](http://sialcasa.github.io/mvvmFX/javadoc/1.3.0/mvvmfx-utils/) -- [javadoc mvvmfx-testing-utils](http://sialcasa.github.io/mvvmFX/javadoc/1.3.0/mvvmfx-testing-utils/) +- [javadoc mvvmfx core](http://sialcasa.github.io/mvvmFX/javadoc/1.3.1/mvvmfx/) +- [javadoc mvvmfx-cdi](http://sialcasa.github.io/mvvmFX/javadoc/1.3.1/mvvmfx-cdi/) +- [javadoc mvvmfx-guice](http://sialcasa.github.io/mvvmFX/javadoc/1.3.1/mvvmfx-guice/) +- [javadoc mvvmfx-utils](http://sialcasa.github.io/mvvmFX/javadoc/1.3.1/mvvmfx-utils/) +- [javadoc mvvmfx-testing-utils](http://sialcasa.github.io/mvvmFX/javadoc/1.3.1/mvvmfx-testing-utils/) From cabe42de479df6da1b1288767eab99f716b933f0 Mon Sep 17 00:00:00 2001 From: Manuel Mauky Date: Wed, 17 Jun 2015 14:17:56 +0200 Subject: [PATCH 02/33] #272 change version number from 1.3.1 to 1.4.0-SNAPSHOT --- examples/mvvmfx-books-example/pom.xml | 2 +- examples/mvvmfx-cdi-starter/pom.xml | 2 +- examples/mvvmfx-complex-example/pom.xml | 2 +- examples/mvvmfx-contacts/pom.xml | 2 +- examples/mvvmfx-fx-root-example/pom.xml | 2 +- examples/mvvmfx-guice-starter/pom.xml | 2 +- examples/mvvmfx-helloworld-without-fxml/pom.xml | 2 +- examples/mvvmfx-helloworld/pom.xml | 2 +- examples/mvvmfx-synchronizefx/pom.xml | 2 +- examples/mvvmfx-todomvc/pom.xml | 2 +- examples/pom.xml | 2 +- mvvmfx-archetype/pom.xml | 2 +- mvvmfx-archetype/src/main/resources/archetype-resources/pom.xml | 2 +- mvvmfx-cdi/pom.xml | 2 +- mvvmfx-guice/pom.xml | 2 +- mvvmfx-testing-utils/pom.xml | 2 +- mvvmfx-utils/pom.xml | 2 +- mvvmfx/pom.xml | 2 +- pom.xml | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/examples/mvvmfx-books-example/pom.xml b/examples/mvvmfx-books-example/pom.xml index 3bbbb5d1b..4f3e91130 100644 --- a/examples/mvvmfx-books-example/pom.xml +++ b/examples/mvvmfx-books-example/pom.xml @@ -5,7 +5,7 @@ mvvmfx-examples de.saxsys - 1.3.1 + 1.4.0-SNAPSHOT 4.0.0 diff --git a/examples/mvvmfx-cdi-starter/pom.xml b/examples/mvvmfx-cdi-starter/pom.xml index 28c6c7edc..1f83a821c 100644 --- a/examples/mvvmfx-cdi-starter/pom.xml +++ b/examples/mvvmfx-cdi-starter/pom.xml @@ -12,7 +12,7 @@ de.saxsys mvvmfx-examples - 1.3.1 + 1.4.0-SNAPSHOT diff --git a/examples/mvvmfx-complex-example/pom.xml b/examples/mvvmfx-complex-example/pom.xml index d1141c813..808d33e09 100644 --- a/examples/mvvmfx-complex-example/pom.xml +++ b/examples/mvvmfx-complex-example/pom.xml @@ -7,7 +7,7 @@ de.saxsys mvvmfx-examples - 1.3.1 + 1.4.0-SNAPSHOT UTF-8 diff --git a/examples/mvvmfx-contacts/pom.xml b/examples/mvvmfx-contacts/pom.xml index 2026c7c78..fbc36b614 100644 --- a/examples/mvvmfx-contacts/pom.xml +++ b/examples/mvvmfx-contacts/pom.xml @@ -6,7 +6,7 @@ mvvmfx-examples de.saxsys - 1.3.1 + 1.4.0-SNAPSHOT mvvmfx-contacts diff --git a/examples/mvvmfx-fx-root-example/pom.xml b/examples/mvvmfx-fx-root-example/pom.xml index 85e84e10d..0520cafad 100644 --- a/examples/mvvmfx-fx-root-example/pom.xml +++ b/examples/mvvmfx-fx-root-example/pom.xml @@ -7,7 +7,7 @@ de.saxsys mvvmfx-examples - 1.3.1 + 1.4.0-SNAPSHOT diff --git a/examples/mvvmfx-guice-starter/pom.xml b/examples/mvvmfx-guice-starter/pom.xml index e6a22de70..5f0beaf4d 100644 --- a/examples/mvvmfx-guice-starter/pom.xml +++ b/examples/mvvmfx-guice-starter/pom.xml @@ -12,7 +12,7 @@ de.saxsys mvvmfx-examples - 1.3.1 + 1.4.0-SNAPSHOT UTF-8 diff --git a/examples/mvvmfx-helloworld-without-fxml/pom.xml b/examples/mvvmfx-helloworld-without-fxml/pom.xml index 13b48b13c..928eba7ee 100644 --- a/examples/mvvmfx-helloworld-without-fxml/pom.xml +++ b/examples/mvvmfx-helloworld-without-fxml/pom.xml @@ -7,7 +7,7 @@ de.saxsys mvvmfx-examples - 1.3.1 + 1.4.0-SNAPSHOT diff --git a/examples/mvvmfx-helloworld/pom.xml b/examples/mvvmfx-helloworld/pom.xml index 5db2635b7..e27d3b368 100644 --- a/examples/mvvmfx-helloworld/pom.xml +++ b/examples/mvvmfx-helloworld/pom.xml @@ -6,7 +6,7 @@ de.saxsys mvvmfx-examples - 1.3.1 + 1.4.0-SNAPSHOT UTF-8 diff --git a/examples/mvvmfx-synchronizefx/pom.xml b/examples/mvvmfx-synchronizefx/pom.xml index 6ac0fe19e..566f0a6eb 100644 --- a/examples/mvvmfx-synchronizefx/pom.xml +++ b/examples/mvvmfx-synchronizefx/pom.xml @@ -6,7 +6,7 @@ de.saxsys mvvmfx-examples - 1.3.1 + 1.4.0-SNAPSHOT UTF-8 diff --git a/examples/mvvmfx-todomvc/pom.xml b/examples/mvvmfx-todomvc/pom.xml index d0d09324f..451f1663a 100644 --- a/examples/mvvmfx-todomvc/pom.xml +++ b/examples/mvvmfx-todomvc/pom.xml @@ -5,7 +5,7 @@ mvvmfx-examples de.saxsys - 1.3.1 + 1.4.0-SNAPSHOT 4.0.0 diff --git a/examples/pom.xml b/examples/pom.xml index 7eba761f9..91df74e0c 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ de.saxsys mvvmfx-parent - 1.3.1 + 1.4.0-SNAPSHOT mvvmfx-examples diff --git a/mvvmfx-archetype/pom.xml b/mvvmfx-archetype/pom.xml index 5a8b7e967..7220b8b63 100644 --- a/mvvmfx-archetype/pom.xml +++ b/mvvmfx-archetype/pom.xml @@ -5,7 +5,7 @@ de.saxsys mvvmfx-parent - 1.3.1 + 1.4.0-SNAPSHOT diff --git a/mvvmfx-archetype/src/main/resources/archetype-resources/pom.xml b/mvvmfx-archetype/src/main/resources/archetype-resources/pom.xml index 660dc2d08..a43abd9d4 100644 --- a/mvvmfx-archetype/src/main/resources/archetype-resources/pom.xml +++ b/mvvmfx-archetype/src/main/resources/archetype-resources/pom.xml @@ -16,7 +16,7 @@ de.saxsys mvvmfx-parent - 1.3.1 + 1.4.0-SNAPSHOT pom import diff --git a/mvvmfx-cdi/pom.xml b/mvvmfx-cdi/pom.xml index 18c124410..fb5e65015 100644 --- a/mvvmfx-cdi/pom.xml +++ b/mvvmfx-cdi/pom.xml @@ -20,7 +20,7 @@ de.saxsys mvvmfx-parent - 1.3.1 + 1.4.0-SNAPSHOT mvvmfx-cdi diff --git a/mvvmfx-guice/pom.xml b/mvvmfx-guice/pom.xml index 9412d8100..79057bec6 100644 --- a/mvvmfx-guice/pom.xml +++ b/mvvmfx-guice/pom.xml @@ -20,7 +20,7 @@ de.saxsys mvvmfx-parent - 1.3.1 + 1.4.0-SNAPSHOT mvvmfx-guice diff --git a/mvvmfx-testing-utils/pom.xml b/mvvmfx-testing-utils/pom.xml index e9e2b8596..b1baef6dc 100644 --- a/mvvmfx-testing-utils/pom.xml +++ b/mvvmfx-testing-utils/pom.xml @@ -5,7 +5,7 @@ mvvmfx-parent de.saxsys - 1.3.1 + 1.4.0-SNAPSHOT 4.0.0 diff --git a/mvvmfx-utils/pom.xml b/mvvmfx-utils/pom.xml index a26609834..aabfa3324 100644 --- a/mvvmfx-utils/pom.xml +++ b/mvvmfx-utils/pom.xml @@ -5,7 +5,7 @@ mvvmfx-parent de.saxsys - 1.3.1 + 1.4.0-SNAPSHOT 4.0.0 diff --git a/mvvmfx/pom.xml b/mvvmfx/pom.xml index 295833e94..0234ab423 100644 --- a/mvvmfx/pom.xml +++ b/mvvmfx/pom.xml @@ -20,7 +20,7 @@ de.saxsys mvvmfx-parent - 1.3.1 + 1.4.0-SNAPSHOT mvvmfx diff --git a/pom.xml b/pom.xml index a87170cdd..e46a1f441 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ de.saxsys mvvmfx-parent pom - 1.3.1 + 1.4.0-SNAPSHOT mvvmFX parent Application Framework for MVVM with JavaFX. http://www.saxsys.de From 67e8ae86a5748f361698c09f76390848af7a3cc9 Mon Sep 17 00:00:00 2001 From: Manuel Mauky Date: Wed, 1 Jul 2015 11:15:27 +0200 Subject: [PATCH 03/33] #275 ViewListCell is now public to allow customization --- .../main/java/de/saxsys/mvvmfx/utils/viewlist/ViewListCell.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mvvmfx/src/main/java/de/saxsys/mvvmfx/utils/viewlist/ViewListCell.java b/mvvmfx/src/main/java/de/saxsys/mvvmfx/utils/viewlist/ViewListCell.java index af4aa8f8e..52aea87a0 100644 --- a/mvvmfx/src/main/java/de/saxsys/mvvmfx/utils/viewlist/ViewListCell.java +++ b/mvvmfx/src/main/java/de/saxsys/mvvmfx/utils/viewlist/ViewListCell.java @@ -31,7 +31,7 @@ * @param * which is used to create get the {@link ViewTuple} */ -abstract class ViewListCell extends ListCell implements +public abstract class ViewListCell extends ListCell implements ViewTupleMapper { @Override From e86550e5a89cf31e8d10769f464951b72406c6c5 Mon Sep 17 00:00:00 2001 From: Manuel Mauky Date: Wed, 1 Jul 2015 11:22:21 +0200 Subject: [PATCH 04/33] #275 remove redundant access modifiers in ViewTupleMapper --- .../java/de/saxsys/mvvmfx/utils/viewlist/ViewTupleMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mvvmfx/src/main/java/de/saxsys/mvvmfx/utils/viewlist/ViewTupleMapper.java b/mvvmfx/src/main/java/de/saxsys/mvvmfx/utils/viewlist/ViewTupleMapper.java index e524ac27d..8e77ca0f7 100644 --- a/mvvmfx/src/main/java/de/saxsys/mvvmfx/utils/viewlist/ViewTupleMapper.java +++ b/mvvmfx/src/main/java/de/saxsys/mvvmfx/utils/viewlist/ViewTupleMapper.java @@ -37,6 +37,6 @@ public interface ViewTupleMapper { * to map * @return created {@link ViewTuple} */ - public abstract ViewTuple map(T element); + ViewTuple map(T element); } From d0e3af3bf669f4b7b7ff540b5c6197ab1eb20c75 Mon Sep 17 00:00:00 2001 From: Manuel Mauky Date: Wed, 1 Jul 2015 11:42:44 +0200 Subject: [PATCH 05/33] #258 remove dependency to assertj from GCVerifier and mvvmfx-testing-utils --- mvvmfx-testing-utils/pom.xml | 2 +- .../main/java/de/saxsys/mvvmfx/testingutils/GCVerifier.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mvvmfx-testing-utils/pom.xml b/mvvmfx-testing-utils/pom.xml index b1baef6dc..71cddd85b 100644 --- a/mvvmfx-testing-utils/pom.xml +++ b/mvvmfx-testing-utils/pom.xml @@ -36,7 +36,7 @@ org.assertj assertj-core - compile + test diff --git a/mvvmfx-testing-utils/src/main/java/de/saxsys/mvvmfx/testingutils/GCVerifier.java b/mvvmfx-testing-utils/src/main/java/de/saxsys/mvvmfx/testingutils/GCVerifier.java index 705740b5f..52d153ede 100644 --- a/mvvmfx-testing-utils/src/main/java/de/saxsys/mvvmfx/testingutils/GCVerifier.java +++ b/mvvmfx-testing-utils/src/main/java/de/saxsys/mvvmfx/testingutils/GCVerifier.java @@ -2,7 +2,6 @@ import java.lang.ref.WeakReference; -import static org.assertj.core.api.Assertions.fail; /** * This is a small testing helper to verify that a given object is available for Garbage Collection. @@ -51,7 +50,7 @@ public void verify(String message) { forceGC(); if (reference.get() != null) { - fail(message); + throw new AssertionError(message); } } From 7823f4cb131607973b6e776bc1b7051878a3d98c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Cudzi=C5=82o?= Date: Thu, 2 Jul 2015 12:20:18 +0200 Subject: [PATCH 06/33] #279 use stand-alone weld-se-core dependency instead of uber-jar weld-se --- mvvmfx-cdi/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mvvmfx-cdi/pom.xml b/mvvmfx-cdi/pom.xml index fb5e65015..099f1956a 100644 --- a/mvvmfx-cdi/pom.xml +++ b/mvvmfx-cdi/pom.xml @@ -63,7 +63,7 @@ org.jboss.weld.se - weld-se + weld-se-core diff --git a/pom.xml b/pom.xml index e46a1f441..45d235bf7 100644 --- a/pom.xml +++ b/pom.xml @@ -149,7 +149,7 @@ org.jboss.weld.se - weld-se + weld-se-core 2.2.11.Final From 2e99e45410100548231d7211173aa98ce8cd630e Mon Sep 17 00:00:00 2001 From: Manuel Mauky Date: Thu, 2 Jul 2015 13:03:06 +0200 Subject: [PATCH 07/33] #217 changed groupid of examples to de.saxsys.mvvmfx --- examples/mvvmfx-books-example/pom.xml | 4 ++-- examples/mvvmfx-cdi-starter/pom.xml | 6 ++--- examples/mvvmfx-complex-example/pom.xml | 4 ++-- examples/mvvmfx-contacts/pom.xml | 4 ++-- examples/mvvmfx-fx-root-example/pom.xml | 4 ++-- examples/mvvmfx-guice-starter/pom.xml | 6 ++--- .../mvvmfx-helloworld-without-fxml/pom.xml | 4 ++-- examples/mvvmfx-helloworld/pom.xml | 4 ++-- examples/mvvmfx-synchronizefx/pom.xml | 4 ++-- examples/mvvmfx-todomvc/pom.xml | 4 ++-- examples/pom.xml | 23 ++++++++++--------- 11 files changed, 34 insertions(+), 33 deletions(-) diff --git a/examples/mvvmfx-books-example/pom.xml b/examples/mvvmfx-books-example/pom.xml index 4f3e91130..eb1f35a41 100644 --- a/examples/mvvmfx-books-example/pom.xml +++ b/examples/mvvmfx-books-example/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - mvvmfx-examples - de.saxsys + de.saxsys.mvvmfx + examples 1.4.0-SNAPSHOT 4.0.0 diff --git a/examples/mvvmfx-cdi-starter/pom.xml b/examples/mvvmfx-cdi-starter/pom.xml index 1f83a821c..a2e6c4aad 100644 --- a/examples/mvvmfx-cdi-starter/pom.xml +++ b/examples/mvvmfx-cdi-starter/pom.xml @@ -10,8 +10,8 @@ - de.saxsys - mvvmfx-examples + de.saxsys.mvvmfx + examples 1.4.0-SNAPSHOT @@ -37,7 +37,7 @@ mvvmfx-cdi - de.saxsys + de.saxsys.mvvmfx mvvmfx-complex diff --git a/examples/mvvmfx-complex-example/pom.xml b/examples/mvvmfx-complex-example/pom.xml index 808d33e09..38e938b45 100644 --- a/examples/mvvmfx-complex-example/pom.xml +++ b/examples/mvvmfx-complex-example/pom.xml @@ -5,8 +5,8 @@ Complex Example - de.saxsys - mvvmfx-examples + de.saxsys.mvvmfx + examples 1.4.0-SNAPSHOT diff --git a/examples/mvvmfx-contacts/pom.xml b/examples/mvvmfx-contacts/pom.xml index fbc36b614..f2ea4cc2b 100644 --- a/examples/mvvmfx-contacts/pom.xml +++ b/examples/mvvmfx-contacts/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - mvvmfx-examples - de.saxsys + de.saxsys.mvvmfx + examples 1.4.0-SNAPSHOT mvvmfx-contacts diff --git a/examples/mvvmfx-fx-root-example/pom.xml b/examples/mvvmfx-fx-root-example/pom.xml index 0520cafad..13529d434 100644 --- a/examples/mvvmfx-fx-root-example/pom.xml +++ b/examples/mvvmfx-fx-root-example/pom.xml @@ -5,8 +5,8 @@ Example with fx:root - de.saxsys - mvvmfx-examples + de.saxsys.mvvmfx + examples 1.4.0-SNAPSHOT diff --git a/examples/mvvmfx-guice-starter/pom.xml b/examples/mvvmfx-guice-starter/pom.xml index 5f0beaf4d..91d60ab2d 100644 --- a/examples/mvvmfx-guice-starter/pom.xml +++ b/examples/mvvmfx-guice-starter/pom.xml @@ -10,8 +10,8 @@ - de.saxsys - mvvmfx-examples + de.saxsys.mvvmfx + examples 1.4.0-SNAPSHOT @@ -51,7 +51,7 @@ mvvmfx-guice - de.saxsys + de.saxsys.mvvmfx mvvmfx-complex diff --git a/examples/mvvmfx-helloworld-without-fxml/pom.xml b/examples/mvvmfx-helloworld-without-fxml/pom.xml index 928eba7ee..595eed38d 100644 --- a/examples/mvvmfx-helloworld-without-fxml/pom.xml +++ b/examples/mvvmfx-helloworld-without-fxml/pom.xml @@ -5,8 +5,8 @@ HelloWorld Example without FXML - de.saxsys - mvvmfx-examples + de.saxsys.mvvmfx + examples 1.4.0-SNAPSHOT diff --git a/examples/mvvmfx-helloworld/pom.xml b/examples/mvvmfx-helloworld/pom.xml index e27d3b368..ff9fae2aa 100644 --- a/examples/mvvmfx-helloworld/pom.xml +++ b/examples/mvvmfx-helloworld/pom.xml @@ -4,8 +4,8 @@ mvvmfx-helloworld HelloWorld Example - de.saxsys - mvvmfx-examples + de.saxsys.mvvmfx + examples 1.4.0-SNAPSHOT diff --git a/examples/mvvmfx-synchronizefx/pom.xml b/examples/mvvmfx-synchronizefx/pom.xml index 566f0a6eb..e470f4118 100644 --- a/examples/mvvmfx-synchronizefx/pom.xml +++ b/examples/mvvmfx-synchronizefx/pom.xml @@ -4,8 +4,8 @@ mvvmfx-synchronizefx SynchronizeFX example - de.saxsys - mvvmfx-examples + de.saxsys.mvvmfx + examples 1.4.0-SNAPSHOT diff --git a/examples/mvvmfx-todomvc/pom.xml b/examples/mvvmfx-todomvc/pom.xml index 451f1663a..cb2aa2d3d 100644 --- a/examples/mvvmfx-todomvc/pom.xml +++ b/examples/mvvmfx-todomvc/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - mvvmfx-examples - de.saxsys + de.saxsys.mvvmfx + examples 1.4.0-SNAPSHOT 4.0.0 diff --git a/examples/pom.xml b/examples/pom.xml index 91df74e0c..93432b5a5 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -8,7 +8,8 @@ 1.4.0-SNAPSHOT - mvvmfx-examples + de.saxsys.mvvmfx + examples pom @@ -29,52 +30,52 @@ - de.saxsys + de.saxsys.mvvmfx mvvmfx-complex ${project.version} - de.saxsys + de.saxsys.mvvmfx mvvmfx-guice-example ${project.version} - de.saxsys + de.saxsys.mvvmfx mvvmfx-cdi-example ${project.version} - de.saxsys + de.saxsys.mvvmfx mvvmfx-fx-root-example ${project.version} - de.saxsys + de.saxsys.mvvmfx mvvmfx-helloworld ${project.version} - de.saxsys + de.saxsys.mvvmfx mvvmfx-helloworld-without-fxml ${project.version} - de.saxsys + de.saxsys.mvvmfx mvvmfx-synchronizefx ${project.version} - de.saxsys + de.saxsys.mvvmfx mvvmfx-contacts ${project.version} - de.saxsys + de.saxsys.mvvmfx mvvmfx-library-example ${project.version} - de.saxsys + de.saxsys.mvvmfx mvvmfx-todomvc ${project.version} From ba92846f8338f5148dc804158c4f1abf233db915 Mon Sep 17 00:00:00 2001 From: Manuel Mauky Date: Thu, 2 Jul 2015 13:05:11 +0200 Subject: [PATCH 08/33] #217 renamed books-example --- .../README.md | 0 .../pom.xml | 2 +- .../screenshot.png | Bin .../de/saxsys/mvvmfx/examples/books/App.java | 0 .../examples/books/BookListItemView.java | 0 .../examples/books/BookListItemViewModel.java | 0 .../mvvmfx/examples/books/MainView.java | 4 +- .../mvvmfx/examples/books/MainViewModel.java | 6 +- .../mvvmfx/examples/books/backend/Book.java | 0 .../mvvmfx/examples/books/backend/Error.java | 0 .../examples/books/backend/HalUtil.java | 0 .../books/backend/LibraryService.java | 0 .../books/backend/LibraryServiceImpl.java | 0 .../books/backend/LibraryServiceMockImpl.java | 0 .../examples/books/BookListItemView.fxml | 0 .../mvvmfx/examples/books/MainView.fxml | 0 .../de/saxsys/mvvmfx/examples/books/style.css | 52 +++++++++--------- .../src/main/resources/logback.xml | 0 .../mvvmfx/examples/books/BooksExampleIT.java | 0 .../examples/books/MainViewModelTest.java | 0 .../books/backend/LibraryServiceMockTest.java | 0 examples/pom.xml | 4 +- 22 files changed, 34 insertions(+), 34 deletions(-) rename examples/{mvvmfx-books-example => books-example}/README.md (100%) rename examples/{mvvmfx-books-example => books-example}/pom.xml (98%) rename examples/{mvvmfx-books-example => books-example}/screenshot.png (100%) rename examples/{mvvmfx-books-example => books-example}/src/main/java/de/saxsys/mvvmfx/examples/books/App.java (100%) rename examples/{mvvmfx-books-example => books-example}/src/main/java/de/saxsys/mvvmfx/examples/books/BookListItemView.java (100%) rename examples/{mvvmfx-books-example => books-example}/src/main/java/de/saxsys/mvvmfx/examples/books/BookListItemViewModel.java (100%) rename examples/{mvvmfx-books-example => books-example}/src/main/java/de/saxsys/mvvmfx/examples/books/MainView.java (99%) rename examples/{mvvmfx-books-example => books-example}/src/main/java/de/saxsys/mvvmfx/examples/books/MainViewModel.java (99%) rename examples/{mvvmfx-books-example => books-example}/src/main/java/de/saxsys/mvvmfx/examples/books/backend/Book.java (100%) rename examples/{mvvmfx-books-example => books-example}/src/main/java/de/saxsys/mvvmfx/examples/books/backend/Error.java (100%) rename examples/{mvvmfx-books-example => books-example}/src/main/java/de/saxsys/mvvmfx/examples/books/backend/HalUtil.java (100%) rename examples/{mvvmfx-books-example => books-example}/src/main/java/de/saxsys/mvvmfx/examples/books/backend/LibraryService.java (100%) rename examples/{mvvmfx-books-example => books-example}/src/main/java/de/saxsys/mvvmfx/examples/books/backend/LibraryServiceImpl.java (100%) rename examples/{mvvmfx-books-example => books-example}/src/main/java/de/saxsys/mvvmfx/examples/books/backend/LibraryServiceMockImpl.java (100%) rename examples/{mvvmfx-books-example => books-example}/src/main/resources/de/saxsys/mvvmfx/examples/books/BookListItemView.fxml (100%) rename examples/{mvvmfx-books-example => books-example}/src/main/resources/de/saxsys/mvvmfx/examples/books/MainView.fxml (100%) rename examples/{mvvmfx-books-example => books-example}/src/main/resources/de/saxsys/mvvmfx/examples/books/style.css (91%) rename examples/{mvvmfx-books-example => books-example}/src/main/resources/logback.xml (100%) rename examples/{mvvmfx-books-example => books-example}/src/test/java/de/saxsys/mvvmfx/examples/books/BooksExampleIT.java (100%) rename examples/{mvvmfx-books-example => books-example}/src/test/java/de/saxsys/mvvmfx/examples/books/MainViewModelTest.java (100%) rename examples/{mvvmfx-books-example => books-example}/src/test/java/de/saxsys/mvvmfx/examples/books/backend/LibraryServiceMockTest.java (100%) diff --git a/examples/mvvmfx-books-example/README.md b/examples/books-example/README.md similarity index 100% rename from examples/mvvmfx-books-example/README.md rename to examples/books-example/README.md diff --git a/examples/mvvmfx-books-example/pom.xml b/examples/books-example/pom.xml similarity index 98% rename from examples/mvvmfx-books-example/pom.xml rename to examples/books-example/pom.xml index eb1f35a41..af413b6c1 100644 --- a/examples/mvvmfx-books-example/pom.xml +++ b/examples/books-example/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - mvvmfx-library-example + books-example UTF-8 diff --git a/examples/mvvmfx-books-example/screenshot.png b/examples/books-example/screenshot.png similarity index 100% rename from examples/mvvmfx-books-example/screenshot.png rename to examples/books-example/screenshot.png diff --git a/examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/App.java b/examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/App.java similarity index 100% rename from examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/App.java rename to examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/App.java diff --git a/examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/BookListItemView.java b/examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/BookListItemView.java similarity index 100% rename from examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/BookListItemView.java rename to examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/BookListItemView.java diff --git a/examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/BookListItemViewModel.java b/examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/BookListItemViewModel.java similarity index 100% rename from examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/BookListItemViewModel.java rename to examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/BookListItemViewModel.java diff --git a/examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/MainView.java b/examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/MainView.java similarity index 99% rename from examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/MainView.java rename to examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/MainView.java index 33d6abb79..2c2aaca3b 100644 --- a/examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/MainView.java +++ b/examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/MainView.java @@ -55,9 +55,9 @@ public void initialize() { viewModel.selectedBookProperty().bind(bookList.getSelectionModel().selectedItemProperty()); errorLabel.textProperty().bind(viewModel.errorProperty()); - + searchButton.disableProperty().bind(viewModel.getSearchCommand().executableProperty().not()); - + } public void searchButtonPressed() { diff --git a/examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/MainViewModel.java b/examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/MainViewModel.java similarity index 99% rename from examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/MainViewModel.java rename to examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/MainViewModel.java index bab3f2d42..222449301 100644 --- a/examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/MainViewModel.java +++ b/examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/MainViewModel.java @@ -32,12 +32,12 @@ public class MainViewModel implements ViewModel { private ObjectProperty selectedBook = new SimpleObjectProperty<>(); private StringProperty error = new SimpleStringProperty(); - + private Command searchCommand; public MainViewModel(LibraryService libraryService) { this.libraryService = libraryService; - + searchCommand = new DelegateCommand(() -> new Action() { @Override protected void action() throws Exception { @@ -53,7 +53,7 @@ protected void action() throws Exception { public Command getSearchCommand() { return searchCommand; } - + void search() { Consumer errorHandler = err -> error.set(err.getMessage()); diff --git a/examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/Book.java b/examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/Book.java similarity index 100% rename from examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/Book.java rename to examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/Book.java diff --git a/examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/Error.java b/examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/Error.java similarity index 100% rename from examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/Error.java rename to examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/Error.java diff --git a/examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/HalUtil.java b/examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/HalUtil.java similarity index 100% rename from examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/HalUtil.java rename to examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/HalUtil.java diff --git a/examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/LibraryService.java b/examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/LibraryService.java similarity index 100% rename from examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/LibraryService.java rename to examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/LibraryService.java diff --git a/examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/LibraryServiceImpl.java b/examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/LibraryServiceImpl.java similarity index 100% rename from examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/LibraryServiceImpl.java rename to examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/LibraryServiceImpl.java diff --git a/examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/LibraryServiceMockImpl.java b/examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/LibraryServiceMockImpl.java similarity index 100% rename from examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/LibraryServiceMockImpl.java rename to examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/backend/LibraryServiceMockImpl.java diff --git a/examples/mvvmfx-books-example/src/main/resources/de/saxsys/mvvmfx/examples/books/BookListItemView.fxml b/examples/books-example/src/main/resources/de/saxsys/mvvmfx/examples/books/BookListItemView.fxml similarity index 100% rename from examples/mvvmfx-books-example/src/main/resources/de/saxsys/mvvmfx/examples/books/BookListItemView.fxml rename to examples/books-example/src/main/resources/de/saxsys/mvvmfx/examples/books/BookListItemView.fxml diff --git a/examples/mvvmfx-books-example/src/main/resources/de/saxsys/mvvmfx/examples/books/MainView.fxml b/examples/books-example/src/main/resources/de/saxsys/mvvmfx/examples/books/MainView.fxml similarity index 100% rename from examples/mvvmfx-books-example/src/main/resources/de/saxsys/mvvmfx/examples/books/MainView.fxml rename to examples/books-example/src/main/resources/de/saxsys/mvvmfx/examples/books/MainView.fxml diff --git a/examples/mvvmfx-books-example/src/main/resources/de/saxsys/mvvmfx/examples/books/style.css b/examples/books-example/src/main/resources/de/saxsys/mvvmfx/examples/books/style.css similarity index 91% rename from examples/mvvmfx-books-example/src/main/resources/de/saxsys/mvvmfx/examples/books/style.css rename to examples/books-example/src/main/resources/de/saxsys/mvvmfx/examples/books/style.css index 16fef4bfb..56c5cbf41 100644 --- a/examples/mvvmfx-books-example/src/main/resources/de/saxsys/mvvmfx/examples/books/style.css +++ b/examples/books-example/src/main/resources/de/saxsys/mvvmfx/examples/books/style.css @@ -1,26 +1,26 @@ -.container { - -} - -.label -{ - -fx-text-fill: black; -} - -.title1{ - -fx-font-size:50; -} - -.title2{ - -fx-font-size:40; - -fx-text-fill: gray; -} - -.errorLabel{ - -fx-font-size:20; - -fx-text-fill: red; -} - -.split-pane *.split-pane-divider { - -fx-padding: 0 1 0 1; -} +.container { + +} + +.label +{ + -fx-text-fill: black; +} + +.title1{ + -fx-font-size:50; +} + +.title2{ + -fx-font-size:40; + -fx-text-fill: gray; +} + +.errorLabel{ + -fx-font-size:20; + -fx-text-fill: red; +} + +.split-pane *.split-pane-divider { + -fx-padding: 0 1 0 1; +} diff --git a/examples/mvvmfx-books-example/src/main/resources/logback.xml b/examples/books-example/src/main/resources/logback.xml similarity index 100% rename from examples/mvvmfx-books-example/src/main/resources/logback.xml rename to examples/books-example/src/main/resources/logback.xml diff --git a/examples/mvvmfx-books-example/src/test/java/de/saxsys/mvvmfx/examples/books/BooksExampleIT.java b/examples/books-example/src/test/java/de/saxsys/mvvmfx/examples/books/BooksExampleIT.java similarity index 100% rename from examples/mvvmfx-books-example/src/test/java/de/saxsys/mvvmfx/examples/books/BooksExampleIT.java rename to examples/books-example/src/test/java/de/saxsys/mvvmfx/examples/books/BooksExampleIT.java diff --git a/examples/mvvmfx-books-example/src/test/java/de/saxsys/mvvmfx/examples/books/MainViewModelTest.java b/examples/books-example/src/test/java/de/saxsys/mvvmfx/examples/books/MainViewModelTest.java similarity index 100% rename from examples/mvvmfx-books-example/src/test/java/de/saxsys/mvvmfx/examples/books/MainViewModelTest.java rename to examples/books-example/src/test/java/de/saxsys/mvvmfx/examples/books/MainViewModelTest.java diff --git a/examples/mvvmfx-books-example/src/test/java/de/saxsys/mvvmfx/examples/books/backend/LibraryServiceMockTest.java b/examples/books-example/src/test/java/de/saxsys/mvvmfx/examples/books/backend/LibraryServiceMockTest.java similarity index 100% rename from examples/mvvmfx-books-example/src/test/java/de/saxsys/mvvmfx/examples/books/backend/LibraryServiceMockTest.java rename to examples/books-example/src/test/java/de/saxsys/mvvmfx/examples/books/backend/LibraryServiceMockTest.java diff --git a/examples/pom.xml b/examples/pom.xml index 93432b5a5..90883cca0 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -22,7 +22,7 @@ mvvmfx-helloworld-without-fxml mvvmfx-synchronizefx mvvmfx-contacts - mvvmfx-books-example + books-example mvvmfx-todomvc @@ -71,7 +71,7 @@ de.saxsys.mvvmfx - mvvmfx-library-example + books-example ${project.version} From d33762b1d5f21d3d03c001bf428cb77537022c77 Mon Sep 17 00:00:00 2001 From: Manuel Mauky Date: Thu, 2 Jul 2015 13:38:42 +0200 Subject: [PATCH 09/33] #217 renamed contacts-example module --- .../README.md | 0 .../about.png | Bin .../address_form.png | Bin .../app.png | Bin .../contact_form.png | Bin .../pom.xml | 4 +- .../saxsys/mvvmfx/examples}/contacts/App.java | 14 ++-- .../contacts/config/ResourceProvider.java | 3 +- .../contacts/events/ContactsUpdatedEvent.java | 2 +- .../contacts/events/OpenAboutDialogEvent.java | 4 +- .../events/OpenAddContactDialogEvent.java | 4 +- .../contacts/events/OpenAuthorPageEvent.java | 4 +- .../events/OpenEditContactDialogEvent.java | 4 +- .../contacts/events/TriggerShutdownEvent.java | 2 +- .../contacts/events/package-info.java | 2 +- .../examples}/contacts/model/Address.java | 2 +- .../examples}/contacts/model/Contact.java | 2 +- .../contacts/model/ContactFactory.java | 2 +- .../examples}/contacts/model/Country.java | 2 +- .../contacts/model/CountrySelector.java | 2 +- .../examples}/contacts/model/Identity.java | 2 +- .../contacts/model/InmemoryRepository.java | 4 +- .../examples}/contacts/model/Repository.java | 2 +- .../examples}/contacts/model/Subdivision.java | 2 +- .../contacts/ui/about/AboutAuthorView.java | 6 +- .../ui/about/AboutAuthorViewModel.java | 2 +- .../contacts/ui/about/AboutView.java | 6 +- .../contacts/ui/about/AboutViewModel.java | 4 +- .../ui/addcontact/AddContactDialog.java | 10 ++- .../addcontact/AddContactDialogViewModel.java | 8 +-- .../ui/addressform/AddressFormView.java | 2 +- .../ui/addressform/AddressFormViewModel.java | 10 +-- .../ui/contactdialog/ContactDialogView.java | 13 ++-- .../contactdialog/ContactDialogViewModel.java | 12 ++-- .../ui/contactform/ContactFormView.java | 2 +- .../ui/contactform/ContactFormViewModel.java | 10 +-- .../contacts/ui/detail/DetailView.java | 2 +- .../contacts/ui/detail/DetailViewModel.java | 12 ++-- .../ui/editcontact/EditContactDialog.java | 11 ++-- .../EditContactDialogViewModel.java | 6 +- .../examples}/contacts/ui/main/MainView.java | 2 +- .../contacts/ui/main/MainViewModel.java | 2 +- .../ui/master/MasterTableViewModel.java | 18 ++---- .../contacts/ui/master/MasterView.java | 2 +- .../contacts/ui/master/MasterViewModel.java | 8 +-- .../examples}/contacts/ui/menu/MenuView.java | 2 +- .../contacts/ui/menu/MenuViewModel.java | 12 ++-- .../contacts/ui/toolbar/ToolbarView.java | 2 +- .../contacts/ui/toolbar/ToolbarViewModel.java | 4 +- .../ui/validators/BirthdayValidator.java | 10 +-- .../ui/validators/EmailValidator.java | 2 +- .../ui/validators/PhoneValidator.java | 10 +-- .../examples}/contacts/util/CentralClock.java | 2 +- .../examples}/contacts/util/DialogHelper.java | 2 +- .../src/main/resources/META-INF/beans.xml | 0 .../src/main/resources/contacts.css | 0 .../src/main/resources/countries/iso_3166.xml | 0 .../main/resources/countries/iso_3166_2.xml | 0 .../src/main/resources/countries/readme.md | 0 .../contacts/ui/about/AboutAuthorView.fxml | 0 .../contacts/ui/about/AboutView.fxml | 0 .../contacts/ui/about/profile_manuel.png | Bin .../ui/addcontact/AddContactDialog.fxml | 0 .../ui/addressform/AddressFormView.fxml | 2 +- .../ui/contactdialog/ContactDialogView.fxml | 2 +- .../ui/contactform/ContactFormView.fxml | 2 +- .../contacts/ui/detail/DetailView.fxml | 2 +- .../ui/editcontact/EditContactDialog.fxml | 0 .../examples}/contacts/ui/main/MainView.fxml | 2 +- .../contacts/ui/master/MasterView.fxml | 2 +- .../examples}/contacts/ui/menu/MenuView.fxml | 2 +- .../contacts/ui/toolbar/ToolbarView.fxml | 2 +- .../src/main/resources/default_de.properties | 0 .../src/main/resources/default_en.properties | 0 .../src/main/resources/logback.xml | 0 .../src/main/resources/menu_de.properties | 0 .../src/main/resources/menu_en.properties | 0 .../examples}/contacts/AppTestFxIT.java | 3 +- .../model/CountrySelectorIntegrationTest.java | 2 +- .../validation/BirthdayValidatorTest.java | 8 +-- .../validation/EmailAddressValidatorTest.java | 6 +- .../validation/PhoneNumberValidatorTest.java | 14 ++-- .../contacts/ui/about/AboutViewModelTest.java | 2 +- .../addressform/AddressFormViewModelTest.java | 12 ++-- .../ContactDialogViewModelTest.java | 6 +- .../ContactFormViewModelTest.java | 60 ++++++++++++++++++ .../ui/detail/DetailViewModelTest.java | 8 +-- .../EditContactDialogViewModelTest.java | 14 ++-- .../ui/master/MasterTableViewModelTest.java | 6 +- .../ui/master/MasterViewModelTest.java | 26 ++++---- .../src/test/resources/countries/iso_3166.xml | 0 .../test/resources/countries/iso_3166_2.xml | 0 .../ContactFormViewModelTest.java | 60 ------------------ examples/pom.xml | 4 +- 94 files changed, 247 insertions(+), 257 deletions(-) rename examples/{mvvmfx-contacts => contacts-example}/README.md (100%) rename examples/{mvvmfx-contacts => contacts-example}/about.png (100%) rename examples/{mvvmfx-contacts => contacts-example}/address_form.png (100%) rename examples/{mvvmfx-contacts => contacts-example}/app.png (100%) rename examples/{mvvmfx-contacts => contacts-example}/contact_form.png (100%) rename examples/{mvvmfx-contacts => contacts-example}/pom.xml (96%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/App.java (82%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/config/ResourceProvider.java (87%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/events/ContactsUpdatedEvent.java (72%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/events/OpenAboutDialogEvent.java (56%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/events/OpenAddContactDialogEvent.java (54%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/events/OpenAuthorPageEvent.java (55%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/events/OpenEditContactDialogEvent.java (78%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/events/TriggerShutdownEvent.java (67%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/events/package-info.java (51%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/model/Address.java (94%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/model/Contact.java (97%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/model/ContactFactory.java (97%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/model/Country.java (96%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/model/CountrySelector.java (99%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/model/Identity.java (94%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/model/InmemoryRepository.java (89%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/model/Repository.java (81%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/model/Subdivision.java (95%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/about/AboutAuthorView.java (83%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/about/AboutAuthorViewModel.java (92%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/about/AboutView.java (87%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/about/AboutViewModel.java (95%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/addcontact/AddContactDialog.java (77%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/addcontact/AddContactDialogViewModel.java (87%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/addressform/AddressFormView.java (96%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/addressform/AddressFormViewModel.java (96%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/contactdialog/ContactDialogView.java (87%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/contactdialog/ContactDialogViewModel.java (90%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/contactform/ContactFormView.java (97%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/contactform/ContactFormViewModel.java (92%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/detail/DetailView.java (98%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/detail/DetailViewModel.java (94%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/editcontact/EditContactDialog.java (77%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/editcontact/EditContactDialogViewModel.java (89%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/main/MainView.java (65%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/main/MainViewModel.java (63%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/master/MasterTableViewModel.java (79%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/master/MasterView.java (92%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/master/MasterViewModel.java (92%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/menu/MenuView.java (92%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/menu/MenuViewModel.java (76%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/toolbar/ToolbarView.java (91%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/toolbar/ToolbarViewModel.java (71%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/validators/BirthdayValidator.java (62%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/validators/EmailValidator.java (93%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/ui/validators/PhoneValidator.java (92%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/util/CentralClock.java (95%) rename examples/{mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx => contacts-example/src/main/java/de/saxsys/mvvmfx/examples}/contacts/util/DialogHelper.java (98%) rename examples/{mvvmfx-contacts => contacts-example}/src/main/resources/META-INF/beans.xml (100%) rename examples/{mvvmfx-contacts => contacts-example}/src/main/resources/contacts.css (100%) rename examples/{mvvmfx-contacts => contacts-example}/src/main/resources/countries/iso_3166.xml (100%) rename examples/{mvvmfx-contacts => contacts-example}/src/main/resources/countries/iso_3166_2.xml (100%) rename examples/{mvvmfx-contacts => contacts-example}/src/main/resources/countries/readme.md (100%) rename examples/{mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx => contacts-example/src/main/resources/de/saxsys/mvvmfx/examples}/contacts/ui/about/AboutAuthorView.fxml (100%) rename examples/{mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx => contacts-example/src/main/resources/de/saxsys/mvvmfx/examples}/contacts/ui/about/AboutView.fxml (100%) rename examples/{mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx => contacts-example/src/main/resources/de/saxsys/mvvmfx/examples}/contacts/ui/about/profile_manuel.png (100%) rename examples/{mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx => contacts-example/src/main/resources/de/saxsys/mvvmfx/examples}/contacts/ui/addcontact/AddContactDialog.fxml (100%) rename examples/{mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx => contacts-example/src/main/resources/de/saxsys/mvvmfx/examples}/contacts/ui/addressform/AddressFormView.fxml (97%) rename examples/{mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx => contacts-example/src/main/resources/de/saxsys/mvvmfx/examples}/contacts/ui/contactdialog/ContactDialogView.fxml (95%) rename examples/{mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx => contacts-example/src/main/resources/de/saxsys/mvvmfx/examples}/contacts/ui/contactform/ContactFormView.fxml (98%) rename examples/{mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx => contacts-example/src/main/resources/de/saxsys/mvvmfx/examples}/contacts/ui/detail/DetailView.fxml (96%) rename examples/{mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx => contacts-example/src/main/resources/de/saxsys/mvvmfx/examples}/contacts/ui/editcontact/EditContactDialog.fxml (100%) rename examples/{mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx => contacts-example/src/main/resources/de/saxsys/mvvmfx/examples}/contacts/ui/main/MainView.fxml (93%) rename examples/{mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx => contacts-example/src/main/resources/de/saxsys/mvvmfx/examples}/contacts/ui/master/MasterView.fxml (96%) rename examples/{mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx => contacts-example/src/main/resources/de/saxsys/mvvmfx/examples}/contacts/ui/menu/MenuView.fxml (93%) rename examples/{mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx => contacts-example/src/main/resources/de/saxsys/mvvmfx/examples}/contacts/ui/toolbar/ToolbarView.fxml (90%) rename examples/{mvvmfx-contacts => contacts-example}/src/main/resources/default_de.properties (100%) rename examples/{mvvmfx-contacts => contacts-example}/src/main/resources/default_en.properties (100%) rename examples/{mvvmfx-contacts => contacts-example}/src/main/resources/logback.xml (100%) rename examples/{mvvmfx-contacts => contacts-example}/src/main/resources/menu_de.properties (100%) rename examples/{mvvmfx-contacts => contacts-example}/src/main/resources/menu_en.properties (100%) rename examples/{mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx => contacts-example/src/test/java/de/saxsys/mvvmfx/examples}/contacts/AppTestFxIT.java (91%) rename examples/{mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx => contacts-example/src/test/java/de/saxsys/mvvmfx/examples}/contacts/model/CountrySelectorIntegrationTest.java (99%) rename examples/{mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx => contacts-example/src/test/java/de/saxsys/mvvmfx/examples}/contacts/model/validation/BirthdayValidatorTest.java (87%) rename examples/{mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx => contacts-example/src/test/java/de/saxsys/mvvmfx/examples}/contacts/model/validation/EmailAddressValidatorTest.java (88%) rename examples/{mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx => contacts-example/src/test/java/de/saxsys/mvvmfx/examples}/contacts/model/validation/PhoneNumberValidatorTest.java (78%) rename examples/{mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx => contacts-example/src/test/java/de/saxsys/mvvmfx/examples}/contacts/ui/about/AboutViewModelTest.java (97%) rename examples/{mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx => contacts-example/src/test/java/de/saxsys/mvvmfx/examples}/contacts/ui/addressform/AddressFormViewModelTest.java (94%) rename examples/{mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx => contacts-example/src/test/java/de/saxsys/mvvmfx/examples}/contacts/ui/contactdialog/ContactDialogViewModelTest.java (95%) create mode 100644 examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/contactdialog/ContactFormViewModelTest.java rename examples/{mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx => contacts-example/src/test/java/de/saxsys/mvvmfx/examples}/contacts/ui/detail/DetailViewModelTest.java (95%) rename examples/{mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx => contacts-example/src/test/java/de/saxsys/mvvmfx/examples}/contacts/ui/editcontact/EditContactDialogViewModelTest.java (83%) rename examples/{mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx => contacts-example/src/test/java/de/saxsys/mvvmfx/examples}/contacts/ui/master/MasterTableViewModelTest.java (81%) rename examples/{mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx => contacts-example/src/test/java/de/saxsys/mvvmfx/examples}/contacts/ui/master/MasterViewModelTest.java (81%) rename examples/{mvvmfx-contacts => contacts-example}/src/test/resources/countries/iso_3166.xml (100%) rename examples/{mvvmfx-contacts => contacts-example}/src/test/resources/countries/iso_3166_2.xml (100%) delete mode 100644 examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/contactdialog/ContactFormViewModelTest.java diff --git a/examples/mvvmfx-contacts/README.md b/examples/contacts-example/README.md similarity index 100% rename from examples/mvvmfx-contacts/README.md rename to examples/contacts-example/README.md diff --git a/examples/mvvmfx-contacts/about.png b/examples/contacts-example/about.png similarity index 100% rename from examples/mvvmfx-contacts/about.png rename to examples/contacts-example/about.png diff --git a/examples/mvvmfx-contacts/address_form.png b/examples/contacts-example/address_form.png similarity index 100% rename from examples/mvvmfx-contacts/address_form.png rename to examples/contacts-example/address_form.png diff --git a/examples/mvvmfx-contacts/app.png b/examples/contacts-example/app.png similarity index 100% rename from examples/mvvmfx-contacts/app.png rename to examples/contacts-example/app.png diff --git a/examples/mvvmfx-contacts/contact_form.png b/examples/contacts-example/contact_form.png similarity index 100% rename from examples/mvvmfx-contacts/contact_form.png rename to examples/contacts-example/contact_form.png diff --git a/examples/mvvmfx-contacts/pom.xml b/examples/contacts-example/pom.xml similarity index 96% rename from examples/mvvmfx-contacts/pom.xml rename to examples/contacts-example/pom.xml index f2ea4cc2b..cc049257a 100644 --- a/examples/mvvmfx-contacts/pom.xml +++ b/examples/contacts-example/pom.xml @@ -8,7 +8,7 @@ examples 1.4.0-SNAPSHOT - mvvmfx-contacts + contacts-example UTF-8 @@ -23,7 +23,7 @@ javafx-maven-plugin 8.1.2 - de.saxsys.mvvmfx.contacts.App + de.saxsys.mvvmfx.examples.contacts.App diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/App.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/App.java similarity index 82% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/App.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/App.java index d2076f989..543131ecf 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/App.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/App.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts; +package de.saxsys.mvvmfx.examples.contacts; import java.util.Locale; import java.util.ResourceBundle; @@ -17,18 +17,18 @@ import de.saxsys.mvvmfx.FluentViewLoader; import de.saxsys.mvvmfx.ViewTuple; import de.saxsys.mvvmfx.cdi.MvvmfxCdiApplication; -import de.saxsys.mvvmfx.contacts.events.TriggerShutdownEvent; -import de.saxsys.mvvmfx.contacts.model.ContactFactory; -import de.saxsys.mvvmfx.contacts.model.Repository; -import de.saxsys.mvvmfx.contacts.ui.main.MainView; -import de.saxsys.mvvmfx.contacts.ui.main.MainViewModel; +import de.saxsys.mvvmfx.examples.contacts.events.TriggerShutdownEvent; +import de.saxsys.mvvmfx.examples.contacts.model.ContactFactory; +import de.saxsys.mvvmfx.examples.contacts.model.Repository; +import de.saxsys.mvvmfx.examples.contacts.ui.main.MainView; +import de.saxsys.mvvmfx.examples.contacts.ui.main.MainViewModel; public class App extends MvvmfxCdiApplication { private static final Logger LOG = LoggerFactory.getLogger(App.class); public static void main(String... args) { - + Locale.setDefault(Locale.ENGLISH); launch(args); diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/config/ResourceProvider.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/config/ResourceProvider.java similarity index 87% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/config/ResourceProvider.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/config/ResourceProvider.java index 0d58d8212..ccef780d2 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/config/ResourceProvider.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/config/ResourceProvider.java @@ -1,8 +1,7 @@ -package de.saxsys.mvvmfx.contacts.config; +package de.saxsys.mvvmfx.examples.contacts.config; import javax.enterprise.inject.Produces; import javax.inject.Singleton; -import java.util.Locale; import java.util.ResourceBundle; /** diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/ContactsUpdatedEvent.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/events/ContactsUpdatedEvent.java similarity index 72% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/ContactsUpdatedEvent.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/events/ContactsUpdatedEvent.java index 692af7b8a..a273c5b6e 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/ContactsUpdatedEvent.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/events/ContactsUpdatedEvent.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.events; +package de.saxsys.mvvmfx.examples.contacts.events; /** * CDI event class that is used to indicate that a contact was updated/added/removed. diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/OpenAboutDialogEvent.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/events/OpenAboutDialogEvent.java similarity index 56% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/OpenAboutDialogEvent.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/events/OpenAboutDialogEvent.java index 508df8ee2..b7947d747 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/OpenAboutDialogEvent.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/events/OpenAboutDialogEvent.java @@ -1,6 +1,6 @@ -package de.saxsys.mvvmfx.contacts.events; +package de.saxsys.mvvmfx.examples.contacts.events; -import de.saxsys.mvvmfx.contacts.ui.about.AboutView; +import de.saxsys.mvvmfx.examples.contacts.ui.about.AboutView; /** * CDI event class that is used to indicate that the {@link AboutView} dialog should be opened. diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/OpenAddContactDialogEvent.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/events/OpenAddContactDialogEvent.java similarity index 54% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/OpenAddContactDialogEvent.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/events/OpenAddContactDialogEvent.java index d0ead6bc5..085bc9022 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/OpenAddContactDialogEvent.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/events/OpenAddContactDialogEvent.java @@ -1,6 +1,6 @@ -package de.saxsys.mvvmfx.contacts.events; +package de.saxsys.mvvmfx.examples.contacts.events; -import de.saxsys.mvvmfx.contacts.ui.addcontact.AddContactDialog; +import de.saxsys.mvvmfx.examples.contacts.ui.addcontact.AddContactDialog; /** * CDI event class that is used to indicate that the {@link AddContactDialog} should be opened. diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/OpenAuthorPageEvent.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/events/OpenAuthorPageEvent.java similarity index 55% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/OpenAuthorPageEvent.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/events/OpenAuthorPageEvent.java index c3bd4ce2c..6c8977679 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/OpenAuthorPageEvent.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/events/OpenAuthorPageEvent.java @@ -1,6 +1,6 @@ -package de.saxsys.mvvmfx.contacts.events; +package de.saxsys.mvvmfx.examples.contacts.events; -import de.saxsys.mvvmfx.contacts.ui.about.AboutAuthorView; +import de.saxsys.mvvmfx.examples.contacts.ui.about.AboutAuthorView; /** * CDI event class that is used to indicate that the {@link AboutAuthorView} dialog should be opened. diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/OpenEditContactDialogEvent.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/events/OpenEditContactDialogEvent.java similarity index 78% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/OpenEditContactDialogEvent.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/events/OpenEditContactDialogEvent.java index d3a8b0037..a7d736526 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/OpenEditContactDialogEvent.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/events/OpenEditContactDialogEvent.java @@ -1,6 +1,6 @@ -package de.saxsys.mvvmfx.contacts.events; +package de.saxsys.mvvmfx.examples.contacts.events; -import de.saxsys.mvvmfx.contacts.ui.editcontact.EditContactDialog; +import de.saxsys.mvvmfx.examples.contacts.ui.editcontact.EditContactDialog; /** * CDI event class that is used to indicate that the {@link EditContactDialog} dialog should be opened. diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/TriggerShutdownEvent.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/events/TriggerShutdownEvent.java similarity index 67% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/TriggerShutdownEvent.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/events/TriggerShutdownEvent.java index 8fd992208..35ee86c8c 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/TriggerShutdownEvent.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/events/TriggerShutdownEvent.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.events; +package de.saxsys.mvvmfx.examples.contacts.events; /** * Event class to trigger the shutdown of the application. diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/package-info.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/events/package-info.java similarity index 51% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/package-info.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/events/package-info.java index 83a3d386d..65a9bda1a 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/package-info.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/events/package-info.java @@ -1,4 +1,4 @@ /** * This package contains CDI event classes. */ -package de.saxsys.mvvmfx.contacts.events; \ No newline at end of file +package de.saxsys.mvvmfx.examples.contacts.events; \ No newline at end of file diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Address.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/Address.java similarity index 94% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Address.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/Address.java index 8c320e63f..5b3addf0f 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Address.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/Address.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.model; +package de.saxsys.mvvmfx.examples.contacts.model; /** * An entity class that represents an address. diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Contact.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/Contact.java similarity index 97% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Contact.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/Contact.java index d0b5a4a09..42b6914bf 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Contact.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/Contact.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.model; +package de.saxsys.mvvmfx.examples.contacts.model; import java.time.LocalDate; diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/ContactFactory.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/ContactFactory.java similarity index 97% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/ContactFactory.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/ContactFactory.java index 3d79b3db5..d890e73e2 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/ContactFactory.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/ContactFactory.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.model; +package de.saxsys.mvvmfx.examples.contacts.model; import java.time.LocalDate; import java.util.Arrays; diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Country.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/Country.java similarity index 96% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Country.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/Country.java index 1afdbe1b5..5d2ff144b 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Country.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/Country.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.model; +package de.saxsys.mvvmfx.examples.contacts.model; import javax.xml.bind.annotation.XmlAccessType; diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/CountrySelector.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/CountrySelector.java similarity index 99% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/CountrySelector.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/CountrySelector.java index 447d74d70..26093c920 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/CountrySelector.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/CountrySelector.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.model; +package de.saxsys.mvvmfx.examples.contacts.model; import java.io.File; import java.io.IOException; diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Identity.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/Identity.java similarity index 94% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Identity.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/Identity.java index 90dfd8ace..a85b6a2c6 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Identity.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/Identity.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.model; +package de.saxsys.mvvmfx.examples.contacts.model; import java.util.UUID; diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/InmemoryRepository.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/InmemoryRepository.java similarity index 89% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/InmemoryRepository.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/InmemoryRepository.java index c099db9db..2ebdbb20f 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/InmemoryRepository.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/InmemoryRepository.java @@ -1,6 +1,6 @@ -package de.saxsys.mvvmfx.contacts.model; +package de.saxsys.mvvmfx.examples.contacts.model; -import de.saxsys.mvvmfx.contacts.events.ContactsUpdatedEvent; +import de.saxsys.mvvmfx.examples.contacts.events.ContactsUpdatedEvent; import javax.enterprise.event.Event; import javax.inject.Inject; diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Repository.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/Repository.java similarity index 81% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Repository.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/Repository.java index 55caaeca3..7bab2c4d5 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Repository.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/Repository.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.model; +package de.saxsys.mvvmfx.examples.contacts.model; import java.util.Optional; import java.util.Set; diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Subdivision.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/Subdivision.java similarity index 95% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Subdivision.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/Subdivision.java index f10d949f3..4c2e1c96b 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Subdivision.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/model/Subdivision.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.model; +package de.saxsys.mvvmfx.examples.contacts.model; public class Subdivision { diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/about/AboutAuthorView.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/about/AboutAuthorView.java similarity index 83% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/about/AboutAuthorView.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/about/AboutAuthorView.java index dc6a06905..4f02e51ac 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/about/AboutAuthorView.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/about/AboutAuthorView.java @@ -1,10 +1,10 @@ -package de.saxsys.mvvmfx.contacts.ui.about; +package de.saxsys.mvvmfx.examples.contacts.ui.about; import de.saxsys.mvvmfx.FluentViewLoader; import de.saxsys.mvvmfx.FxmlView; import de.saxsys.mvvmfx.InjectViewModel; -import de.saxsys.mvvmfx.contacts.events.OpenAuthorPageEvent; -import de.saxsys.mvvmfx.contacts.util.DialogHelper; +import de.saxsys.mvvmfx.examples.contacts.events.OpenAuthorPageEvent; +import de.saxsys.mvvmfx.examples.contacts.util.DialogHelper; import javafx.fxml.FXML; import javafx.scene.Parent; import javafx.stage.Stage; diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/about/AboutAuthorViewModel.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/about/AboutAuthorViewModel.java similarity index 92% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/about/AboutAuthorViewModel.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/about/AboutAuthorViewModel.java index 2723fc952..5140d289e 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/about/AboutAuthorViewModel.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/about/AboutAuthorViewModel.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.ui.about; +package de.saxsys.mvvmfx.examples.contacts.ui.about; import de.saxsys.mvvmfx.ViewModel; import javafx.application.HostServices; diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/about/AboutView.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/about/AboutView.java similarity index 87% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/about/AboutView.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/about/AboutView.java index 461e7cce9..fa1d73c3f 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/about/AboutView.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/about/AboutView.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.ui.about; +package de.saxsys.mvvmfx.examples.contacts.ui.about; import javafx.fxml.FXML; import javafx.scene.Parent; @@ -14,8 +14,8 @@ import de.saxsys.mvvmfx.FluentViewLoader; import de.saxsys.mvvmfx.FxmlView; import de.saxsys.mvvmfx.InjectViewModel; -import de.saxsys.mvvmfx.contacts.events.OpenAboutDialogEvent; -import de.saxsys.mvvmfx.contacts.util.DialogHelper; +import de.saxsys.mvvmfx.examples.contacts.events.OpenAboutDialogEvent; +import de.saxsys.mvvmfx.examples.contacts.util.DialogHelper; @Singleton public class AboutView implements FxmlView { diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/about/AboutViewModel.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/about/AboutViewModel.java similarity index 95% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/about/AboutViewModel.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/about/AboutViewModel.java index fd9921547..22e24f4e7 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/about/AboutViewModel.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/about/AboutViewModel.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.ui.about; +package de.saxsys.mvvmfx.examples.contacts.ui.about; import java.util.function.Consumer; @@ -16,7 +16,7 @@ import javax.inject.Inject; import de.saxsys.mvvmfx.ViewModel; -import de.saxsys.mvvmfx.contacts.events.OpenAuthorPageEvent; +import de.saxsys.mvvmfx.examples.contacts.events.OpenAuthorPageEvent; public class AboutViewModel implements ViewModel { diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/addcontact/AddContactDialog.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/addcontact/AddContactDialog.java similarity index 77% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/addcontact/AddContactDialog.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/addcontact/AddContactDialog.java index 328181926..70fc4fcd4 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/addcontact/AddContactDialog.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/addcontact/AddContactDialog.java @@ -1,6 +1,5 @@ -package de.saxsys.mvvmfx.contacts.ui.addcontact; +package de.saxsys.mvvmfx.examples.contacts.ui.addcontact; -import java.util.ResourceBundle; import javafx.fxml.FXML; import javafx.scene.Parent; import javafx.stage.Stage; @@ -12,10 +11,9 @@ import de.saxsys.mvvmfx.FluentViewLoader; import de.saxsys.mvvmfx.FxmlView; import de.saxsys.mvvmfx.InjectViewModel; -import de.saxsys.mvvmfx.ViewTuple; -import de.saxsys.mvvmfx.contacts.events.OpenAddContactDialogEvent; -import de.saxsys.mvvmfx.contacts.ui.contactdialog.ContactDialogView; -import de.saxsys.mvvmfx.contacts.util.DialogHelper; +import de.saxsys.mvvmfx.examples.contacts.events.OpenAddContactDialogEvent; +import de.saxsys.mvvmfx.examples.contacts.ui.contactdialog.ContactDialogView; +import de.saxsys.mvvmfx.examples.contacts.util.DialogHelper; @Singleton public class AddContactDialog implements FxmlView { diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/addcontact/AddContactDialogViewModel.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/addcontact/AddContactDialogViewModel.java similarity index 87% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/addcontact/AddContactDialogViewModel.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/addcontact/AddContactDialogViewModel.java index f20f120cd..0f3438e64 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/addcontact/AddContactDialogViewModel.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/addcontact/AddContactDialogViewModel.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.ui.addcontact; +package de.saxsys.mvvmfx.examples.contacts.ui.addcontact; import java.util.ResourceBundle; import javafx.beans.property.BooleanProperty; @@ -7,9 +7,9 @@ import javax.inject.Inject; import de.saxsys.mvvmfx.ViewModel; -import de.saxsys.mvvmfx.contacts.model.Contact; -import de.saxsys.mvvmfx.contacts.model.Repository; -import de.saxsys.mvvmfx.contacts.ui.contactdialog.ContactDialogViewModel; +import de.saxsys.mvvmfx.examples.contacts.model.Contact; +import de.saxsys.mvvmfx.examples.contacts.model.Repository; +import de.saxsys.mvvmfx.examples.contacts.ui.contactdialog.ContactDialogViewModel; public class AddContactDialogViewModel implements ViewModel { static final String TITLE_LABEL_KEY = "dialog.addcontact.title"; diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/addressform/AddressFormView.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/addressform/AddressFormView.java similarity index 96% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/addressform/AddressFormView.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/addressform/AddressFormView.java index 8a7ef16bf..532c338cb 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/addressform/AddressFormView.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/addressform/AddressFormView.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.ui.addressform; +package de.saxsys.mvvmfx.examples.contacts.ui.addressform; import javafx.fxml.FXML; import javafx.scene.control.ComboBox; diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/addressform/AddressFormViewModel.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/addressform/AddressFormViewModel.java similarity index 96% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/addressform/AddressFormViewModel.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/addressform/AddressFormViewModel.java index f7f29e7ef..cf1af56fe 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/addressform/AddressFormViewModel.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/addressform/AddressFormViewModel.java @@ -1,9 +1,9 @@ -package de.saxsys.mvvmfx.contacts.ui.addressform; +package de.saxsys.mvvmfx.examples.contacts.ui.addressform; import java.util.Optional; import java.util.ResourceBundle; -import de.saxsys.mvvmfx.contacts.model.Address; +import de.saxsys.mvvmfx.examples.contacts.model.Address; import javafx.beans.binding.Bindings; import javafx.beans.property.ObjectProperty; import javafx.beans.property.ReadOnlyBooleanProperty; @@ -21,9 +21,9 @@ import javax.inject.Inject; import de.saxsys.mvvmfx.ViewModel; -import de.saxsys.mvvmfx.contacts.model.Country; -import de.saxsys.mvvmfx.contacts.model.CountrySelector; -import de.saxsys.mvvmfx.contacts.model.Subdivision; +import de.saxsys.mvvmfx.examples.contacts.model.Country; +import de.saxsys.mvvmfx.examples.contacts.model.CountrySelector; +import de.saxsys.mvvmfx.examples.contacts.model.Subdivision; import de.saxsys.mvvmfx.utils.itemlist.ItemList; public class AddressFormViewModel implements ViewModel { diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/contactdialog/ContactDialogView.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/contactdialog/ContactDialogView.java similarity index 87% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/contactdialog/ContactDialogView.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/contactdialog/ContactDialogView.java index 6adadaef7..faee01cb2 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/contactdialog/ContactDialogView.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/contactdialog/ContactDialogView.java @@ -1,24 +1,21 @@ -package de.saxsys.mvvmfx.contacts.ui.contactdialog; +package de.saxsys.mvvmfx.examples.contacts.ui.contactdialog; -import java.util.ResourceBundle; import javafx.fxml.FXML; import javafx.scene.control.Button; import javafx.scene.control.ContentDisplay; import javafx.scene.control.Pagination; import javafx.scene.text.Text; -import javax.inject.Inject; - import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; import de.saxsys.mvvmfx.FluentViewLoader; import de.saxsys.mvvmfx.FxmlView; import de.saxsys.mvvmfx.InjectViewModel; import de.saxsys.mvvmfx.ViewTuple; -import de.saxsys.mvvmfx.contacts.ui.addressform.AddressFormView; -import de.saxsys.mvvmfx.contacts.ui.addressform.AddressFormViewModel; -import de.saxsys.mvvmfx.contacts.ui.contactform.ContactFormView; -import de.saxsys.mvvmfx.contacts.ui.contactform.ContactFormViewModel; +import de.saxsys.mvvmfx.examples.contacts.ui.addressform.AddressFormView; +import de.saxsys.mvvmfx.examples.contacts.ui.addressform.AddressFormViewModel; +import de.saxsys.mvvmfx.examples.contacts.ui.contactform.ContactFormView; +import de.saxsys.mvvmfx.examples.contacts.ui.contactform.ContactFormViewModel; public class ContactDialogView implements FxmlView { diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/contactdialog/ContactDialogViewModel.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/contactdialog/ContactDialogViewModel.java similarity index 90% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/contactdialog/ContactDialogViewModel.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/contactdialog/ContactDialogViewModel.java index 14179ab7a..01c7905e4 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/contactdialog/ContactDialogViewModel.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/contactdialog/ContactDialogViewModel.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.ui.contactdialog; +package de.saxsys.mvvmfx.examples.contacts.ui.contactdialog; import javafx.beans.binding.Bindings; import javafx.beans.binding.BooleanBinding; @@ -6,8 +6,8 @@ import javafx.beans.value.ObservableBooleanValue; import de.saxsys.mvvmfx.ViewModel; -import de.saxsys.mvvmfx.contacts.ui.addressform.AddressFormViewModel; -import de.saxsys.mvvmfx.contacts.ui.contactform.ContactFormViewModel; +import de.saxsys.mvvmfx.examples.contacts.ui.addressform.AddressFormViewModel; +import de.saxsys.mvvmfx.examples.contacts.ui.contactform.ContactFormViewModel; public class ContactDialogViewModel implements ViewModel { @@ -31,7 +31,8 @@ public ContactDialogViewModel() { // as soon as both viewModels are set we add a binding that is true only when both viewModels are valid. viewModelsInitialized.addListener((obs, oldV, newV) -> { if (newV) { - valid.bind(Bindings.and(contactFormViewModel.get().validProperty(), addressFormViewModel.get().validProperty())); + valid.bind(Bindings.and(contactFormViewModel.get().validProperty(), addressFormViewModel.get() + .validProperty())); } else { valid.unbind(); } @@ -91,7 +92,8 @@ public IntegerProperty dialogPageProperty() { public ObservableBooleanValue okButtonDisabledProperty() { - return Bindings.and(contactFormViewModel.get().validProperty(), addressFormViewModel.get().validProperty()).not(); + return Bindings.and(contactFormViewModel.get().validProperty(), addressFormViewModel.get().validProperty()) + .not(); } public ObservableBooleanValue okButtonVisibleProperty() { diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/contactform/ContactFormView.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/contactform/ContactFormView.java similarity index 97% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/contactform/ContactFormView.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/contactform/ContactFormView.java index de1609d9b..bac28f484 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/contactform/ContactFormView.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/contactform/ContactFormView.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.ui.contactform; +package de.saxsys.mvvmfx.examples.contacts.ui.contactform; import de.saxsys.mvvmfx.FxmlView; import de.saxsys.mvvmfx.InjectViewModel; diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/contactform/ContactFormViewModel.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/contactform/ContactFormViewModel.java similarity index 92% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/contactform/ContactFormViewModel.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/contactform/ContactFormViewModel.java index debcb7604..fafb48686 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/contactform/ContactFormViewModel.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/contactform/ContactFormViewModel.java @@ -1,10 +1,10 @@ -package de.saxsys.mvvmfx.contacts.ui.contactform; +package de.saxsys.mvvmfx.examples.contacts.ui.contactform; import de.saxsys.mvvmfx.ViewModel; -import de.saxsys.mvvmfx.contacts.model.Contact; -import de.saxsys.mvvmfx.contacts.ui.validators.BirthdayValidator; -import de.saxsys.mvvmfx.contacts.ui.validators.EmailValidator; -import de.saxsys.mvvmfx.contacts.ui.validators.PhoneValidator; +import de.saxsys.mvvmfx.examples.contacts.model.Contact; +import de.saxsys.mvvmfx.examples.contacts.ui.validators.BirthdayValidator; +import de.saxsys.mvvmfx.examples.contacts.ui.validators.EmailValidator; +import de.saxsys.mvvmfx.examples.contacts.ui.validators.PhoneValidator; import de.saxsys.mvvmfx.utils.mapping.ModelWrapper; import de.saxsys.mvvmfx.utils.validation.*; import javafx.beans.binding.BooleanExpression; diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/detail/DetailView.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/detail/DetailView.java similarity index 98% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/detail/DetailView.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/detail/DetailView.java index f7e568cba..0790c7c21 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/detail/DetailView.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/detail/DetailView.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.ui.detail; +package de.saxsys.mvvmfx.examples.contacts.ui.detail; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/detail/DetailViewModel.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/detail/DetailViewModel.java similarity index 94% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/detail/DetailViewModel.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/detail/DetailViewModel.java index 4515a0ed7..0f76682f4 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/detail/DetailViewModel.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/detail/DetailViewModel.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.ui.detail; +package de.saxsys.mvvmfx.examples.contacts.ui.detail; import static eu.lestard.advanced_bindings.api.ObjectBindings.map; @@ -20,11 +20,11 @@ import javax.inject.Inject; import de.saxsys.mvvmfx.ViewModel; -import de.saxsys.mvvmfx.contacts.events.OpenEditContactDialogEvent; -import de.saxsys.mvvmfx.contacts.model.Address; -import de.saxsys.mvvmfx.contacts.model.Contact; -import de.saxsys.mvvmfx.contacts.model.Repository; -import de.saxsys.mvvmfx.contacts.ui.master.MasterViewModel; +import de.saxsys.mvvmfx.examples.contacts.events.OpenEditContactDialogEvent; +import de.saxsys.mvvmfx.examples.contacts.model.Address; +import de.saxsys.mvvmfx.examples.contacts.model.Contact; +import de.saxsys.mvvmfx.examples.contacts.model.Repository; +import de.saxsys.mvvmfx.examples.contacts.ui.master.MasterViewModel; public class DetailViewModel implements ViewModel { diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/editcontact/EditContactDialog.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/editcontact/EditContactDialog.java similarity index 77% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/editcontact/EditContactDialog.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/editcontact/EditContactDialog.java index c8b52bca1..885637fee 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/editcontact/EditContactDialog.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/editcontact/EditContactDialog.java @@ -1,6 +1,4 @@ -package de.saxsys.mvvmfx.contacts.ui.editcontact; - -import java.util.ResourceBundle; +package de.saxsys.mvvmfx.examples.contacts.ui.editcontact; import javafx.fxml.FXML; import javafx.scene.Parent; @@ -13,10 +11,9 @@ import de.saxsys.mvvmfx.FluentViewLoader; import de.saxsys.mvvmfx.FxmlView; import de.saxsys.mvvmfx.InjectViewModel; -import de.saxsys.mvvmfx.ViewTuple; -import de.saxsys.mvvmfx.contacts.events.OpenEditContactDialogEvent; -import de.saxsys.mvvmfx.contacts.ui.contactdialog.ContactDialogView; -import de.saxsys.mvvmfx.contacts.util.DialogHelper; +import de.saxsys.mvvmfx.examples.contacts.events.OpenEditContactDialogEvent; +import de.saxsys.mvvmfx.examples.contacts.ui.contactdialog.ContactDialogView; +import de.saxsys.mvvmfx.examples.contacts.util.DialogHelper; @Singleton public class EditContactDialog implements FxmlView { diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/editcontact/EditContactDialogViewModel.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/editcontact/EditContactDialogViewModel.java similarity index 89% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/editcontact/EditContactDialogViewModel.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/editcontact/EditContactDialogViewModel.java index 58e2d44cc..98df37e86 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/editcontact/EditContactDialogViewModel.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/editcontact/EditContactDialogViewModel.java @@ -1,8 +1,8 @@ -package de.saxsys.mvvmfx.contacts.ui.editcontact; +package de.saxsys.mvvmfx.examples.contacts.ui.editcontact; import de.saxsys.mvvmfx.ViewModel; -import de.saxsys.mvvmfx.contacts.model.Repository; -import de.saxsys.mvvmfx.contacts.ui.contactdialog.ContactDialogViewModel; +import de.saxsys.mvvmfx.examples.contacts.model.Repository; +import de.saxsys.mvvmfx.examples.contacts.ui.contactdialog.ContactDialogViewModel; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/main/MainView.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/main/MainView.java similarity index 65% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/main/MainView.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/main/MainView.java index 110e5b211..69ef7e5dc 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/main/MainView.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/main/MainView.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.ui.main; +package de.saxsys.mvvmfx.examples.contacts.ui.main; import de.saxsys.mvvmfx.FxmlView; diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/main/MainViewModel.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/main/MainViewModel.java similarity index 63% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/main/MainViewModel.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/main/MainViewModel.java index 2ca2d8210..39ea3611a 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/main/MainViewModel.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/main/MainViewModel.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.ui.main; +package de.saxsys.mvvmfx.examples.contacts.ui.main; import de.saxsys.mvvmfx.ViewModel; diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/master/MasterTableViewModel.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/master/MasterTableViewModel.java similarity index 79% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/master/MasterTableViewModel.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/master/MasterTableViewModel.java index 12a18ec8c..bfd04fd00 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/master/MasterTableViewModel.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/master/MasterTableViewModel.java @@ -1,15 +1,11 @@ -package de.saxsys.mvvmfx.contacts.ui.master; +package de.saxsys.mvvmfx.examples.contacts.ui.master; -import de.saxsys.mvvmfx.contacts.model.Contact; -import de.saxsys.mvvmfx.contacts.util.CentralClock; +import de.saxsys.mvvmfx.examples.contacts.model.Contact; +import de.saxsys.mvvmfx.examples.contacts.util.CentralClock; import de.saxsys.mvvmfx.utils.mapping.ModelWrapper; import de.saxsys.mvvmfx.utils.mapping.accessorfunctions.StringGetter; -import de.saxsys.mvvmfx.utils.mapping.accessorfunctions.StringSetter; import javafx.beans.property.IntegerProperty; -import javafx.beans.property.ReadOnlyStringProperty; -import javafx.beans.property.ReadOnlyStringWrapper; import javafx.beans.property.SimpleIntegerProperty; -import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; import java.time.LocalDate; @@ -71,11 +67,11 @@ public StringProperty lastnameProperty() { public StringProperty titleProperty() { - return contactWrapper.field("title", Contact::getTitle, Contact::setTitle); + return contactWrapper.field("title", Contact::getTitle, Contact::setTitle); } public StringProperty emailAddressProperty() { - return contactWrapper.field("emailAddress", Contact::getEmailAddress, Contact::setEmailAddress); + return contactWrapper.field("emailAddress", Contact::getEmailAddress, Contact::setEmailAddress); } public IntegerProperty ageProperty() { @@ -83,8 +79,8 @@ public IntegerProperty ageProperty() { } public StringProperty cityProperty() { - return contactWrapper.field("city", - (StringGetter) model -> model.getAddress().getCity(), + return contactWrapper.field("city", + (StringGetter) model -> model.getAddress().getCity(), (model, value) -> model.getAddress().setCity(value)); } diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/master/MasterView.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/master/MasterView.java similarity index 92% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/master/MasterView.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/master/MasterView.java index fc72f564c..29337fe54 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/master/MasterView.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/master/MasterView.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.ui.master; +package de.saxsys.mvvmfx.examples.contacts.ui.master; import de.saxsys.mvvmfx.FxmlView; import de.saxsys.mvvmfx.InjectViewModel; diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/master/MasterViewModel.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/master/MasterViewModel.java similarity index 92% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/master/MasterViewModel.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/master/MasterViewModel.java index bb4f3ae0e..8854ebd0b 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/master/MasterViewModel.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/master/MasterViewModel.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.ui.master; +package de.saxsys.mvvmfx.examples.contacts.ui.master; import java.util.Optional; import java.util.Set; @@ -21,9 +21,9 @@ import org.slf4j.LoggerFactory; import de.saxsys.mvvmfx.ViewModel; -import de.saxsys.mvvmfx.contacts.events.ContactsUpdatedEvent; -import de.saxsys.mvvmfx.contacts.model.Contact; -import de.saxsys.mvvmfx.contacts.model.Repository; +import de.saxsys.mvvmfx.examples.contacts.events.ContactsUpdatedEvent; +import de.saxsys.mvvmfx.examples.contacts.model.Contact; +import de.saxsys.mvvmfx.examples.contacts.model.Repository; @ApplicationScoped diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/menu/MenuView.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/menu/MenuView.java similarity index 92% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/menu/MenuView.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/menu/MenuView.java index e4e599c67..67ebfeed4 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/menu/MenuView.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/menu/MenuView.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.ui.menu; +package de.saxsys.mvvmfx.examples.contacts.ui.menu; import javafx.fxml.FXML; import javafx.scene.control.MenuItem; diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/menu/MenuViewModel.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/menu/MenuViewModel.java similarity index 76% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/menu/MenuViewModel.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/menu/MenuViewModel.java index 74c41409e..abd13370a 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/menu/MenuViewModel.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/menu/MenuViewModel.java @@ -1,6 +1,6 @@ -package de.saxsys.mvvmfx.contacts.ui.menu; +package de.saxsys.mvvmfx.examples.contacts.ui.menu; -import de.saxsys.mvvmfx.contacts.events.OpenAboutDialogEvent; +import de.saxsys.mvvmfx.examples.contacts.events.OpenAboutDialogEvent; import javafx.beans.property.ReadOnlyBooleanProperty; import javafx.beans.property.ReadOnlyBooleanWrapper; @@ -9,10 +9,10 @@ import javax.inject.Inject; import de.saxsys.mvvmfx.ViewModel; -import de.saxsys.mvvmfx.contacts.events.TriggerShutdownEvent; -import de.saxsys.mvvmfx.contacts.model.Contact; -import de.saxsys.mvvmfx.contacts.model.Repository; -import de.saxsys.mvvmfx.contacts.ui.master.MasterViewModel; +import de.saxsys.mvvmfx.examples.contacts.events.TriggerShutdownEvent; +import de.saxsys.mvvmfx.examples.contacts.model.Contact; +import de.saxsys.mvvmfx.examples.contacts.model.Repository; +import de.saxsys.mvvmfx.examples.contacts.ui.master.MasterViewModel; public class MenuViewModel implements ViewModel { diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/toolbar/ToolbarView.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/toolbar/ToolbarView.java similarity index 91% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/toolbar/ToolbarView.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/toolbar/ToolbarView.java index 3cd93e982..3b59de830 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/toolbar/ToolbarView.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/toolbar/ToolbarView.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.ui.toolbar; +package de.saxsys.mvvmfx.examples.contacts.ui.toolbar; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/toolbar/ToolbarViewModel.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/toolbar/ToolbarViewModel.java similarity index 71% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/toolbar/ToolbarViewModel.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/toolbar/ToolbarViewModel.java index fc299aa23..618d4af83 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/toolbar/ToolbarViewModel.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/toolbar/ToolbarViewModel.java @@ -1,7 +1,7 @@ -package de.saxsys.mvvmfx.contacts.ui.toolbar; +package de.saxsys.mvvmfx.examples.contacts.ui.toolbar; import de.saxsys.mvvmfx.ViewModel; -import de.saxsys.mvvmfx.contacts.events.OpenAddContactDialogEvent; +import de.saxsys.mvvmfx.examples.contacts.events.OpenAddContactDialogEvent; import javax.enterprise.event.Event; import javax.inject.Inject; diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/validators/BirthdayValidator.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/validators/BirthdayValidator.java similarity index 62% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/validators/BirthdayValidator.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/validators/BirthdayValidator.java index 77ea6cb80..c98757e85 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/validators/BirthdayValidator.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/validators/BirthdayValidator.java @@ -1,6 +1,6 @@ -package de.saxsys.mvvmfx.contacts.ui.validators; +package de.saxsys.mvvmfx.examples.contacts.ui.validators; -import de.saxsys.mvvmfx.contacts.util.CentralClock; +import de.saxsys.mvvmfx.examples.contacts.util.CentralClock; import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator; import de.saxsys.mvvmfx.utils.validation.ValidationMessage; import javafx.beans.value.ObservableValue; @@ -14,9 +14,9 @@ public class BirthdayValidator extends FunctionBasedValidator { private static final Predicate birthdayPredicate = date -> - date == null || date.isBefore(LocalDate.now(CentralClock.getClock())); - + date == null || date.isBefore(LocalDate.now(CentralClock.getClock())); + public BirthdayValidator(ObservableValue date) { - super(date, birthdayPredicate, ValidationMessage.error("Birthday can't be set in the future")); + super(date, birthdayPredicate, ValidationMessage.error("Birthday can't be set in the future")); } } diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/validators/EmailValidator.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/validators/EmailValidator.java similarity index 93% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/validators/EmailValidator.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/validators/EmailValidator.java index f0cb71937..4048534a2 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/validators/EmailValidator.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/validators/EmailValidator.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.ui.validators; +package de.saxsys.mvvmfx.examples.contacts.ui.validators; import de.saxsys.mvvmfx.utils.validation.ObservableRules; import de.saxsys.mvvmfx.utils.validation.ValidationMessage; diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/validators/PhoneValidator.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/validators/PhoneValidator.java similarity index 92% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/validators/PhoneValidator.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/validators/PhoneValidator.java index 1680090ef..5093decb5 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/validators/PhoneValidator.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/ui/validators/PhoneValidator.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.ui.validators; +package de.saxsys.mvvmfx.examples.contacts.ui.validators; import de.saxsys.mvvmfx.utils.validation.ValidationMessage; import de.saxsys.mvvmfx.utils.validation.ObservableRuleBasedValidator; @@ -12,18 +12,18 @@ * @author manuel.mauky */ public class PhoneValidator extends ObservableRuleBasedValidator { - + private static final Pattern SIMPLE_PHONE_PATTERN = Pattern.compile("\\+?[0-9\\s]{3,20}"); public PhoneValidator(ObservableValue number, String message) { - + final BooleanBinding phonePatternMatches = Bindings.createBooleanBinding(() -> { final String input = number.getValue(); - + if (input == null || input.trim().isEmpty()) { return true; } - + return SIMPLE_PHONE_PATTERN.matcher(input).matches(); }, number); diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/util/CentralClock.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/util/CentralClock.java similarity index 95% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/util/CentralClock.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/util/CentralClock.java index cf91f5a98..49130d736 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/util/CentralClock.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/util/CentralClock.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.util; +package de.saxsys.mvvmfx.examples.contacts.util; import java.time.Clock; import java.time.ZoneId; diff --git a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/util/DialogHelper.java b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/util/DialogHelper.java similarity index 98% rename from examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/util/DialogHelper.java rename to examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/util/DialogHelper.java index 241c655ac..e6a88e45d 100644 --- a/examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/util/DialogHelper.java +++ b/examples/contacts-example/src/main/java/de/saxsys/mvvmfx/examples/contacts/util/DialogHelper.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.util; +package de.saxsys.mvvmfx.examples.contacts.util; import java.util.function.Supplier; import javafx.beans.property.BooleanProperty; diff --git a/examples/mvvmfx-contacts/src/main/resources/META-INF/beans.xml b/examples/contacts-example/src/main/resources/META-INF/beans.xml similarity index 100% rename from examples/mvvmfx-contacts/src/main/resources/META-INF/beans.xml rename to examples/contacts-example/src/main/resources/META-INF/beans.xml diff --git a/examples/mvvmfx-contacts/src/main/resources/contacts.css b/examples/contacts-example/src/main/resources/contacts.css similarity index 100% rename from examples/mvvmfx-contacts/src/main/resources/contacts.css rename to examples/contacts-example/src/main/resources/contacts.css diff --git a/examples/mvvmfx-contacts/src/main/resources/countries/iso_3166.xml b/examples/contacts-example/src/main/resources/countries/iso_3166.xml similarity index 100% rename from examples/mvvmfx-contacts/src/main/resources/countries/iso_3166.xml rename to examples/contacts-example/src/main/resources/countries/iso_3166.xml diff --git a/examples/mvvmfx-contacts/src/main/resources/countries/iso_3166_2.xml b/examples/contacts-example/src/main/resources/countries/iso_3166_2.xml similarity index 100% rename from examples/mvvmfx-contacts/src/main/resources/countries/iso_3166_2.xml rename to examples/contacts-example/src/main/resources/countries/iso_3166_2.xml diff --git a/examples/mvvmfx-contacts/src/main/resources/countries/readme.md b/examples/contacts-example/src/main/resources/countries/readme.md similarity index 100% rename from examples/mvvmfx-contacts/src/main/resources/countries/readme.md rename to examples/contacts-example/src/main/resources/countries/readme.md diff --git a/examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/about/AboutAuthorView.fxml b/examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/about/AboutAuthorView.fxml similarity index 100% rename from examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/about/AboutAuthorView.fxml rename to examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/about/AboutAuthorView.fxml diff --git a/examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/about/AboutView.fxml b/examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/about/AboutView.fxml similarity index 100% rename from examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/about/AboutView.fxml rename to examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/about/AboutView.fxml diff --git a/examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/about/profile_manuel.png b/examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/about/profile_manuel.png similarity index 100% rename from examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/about/profile_manuel.png rename to examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/about/profile_manuel.png diff --git a/examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/addcontact/AddContactDialog.fxml b/examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/addcontact/AddContactDialog.fxml similarity index 100% rename from examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/addcontact/AddContactDialog.fxml rename to examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/addcontact/AddContactDialog.fxml diff --git a/examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/addressform/AddressFormView.fxml b/examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/addressform/AddressFormView.fxml similarity index 97% rename from examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/addressform/AddressFormView.fxml rename to examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/addressform/AddressFormView.fxml index 1a730aa77..8e395b903 100644 --- a/examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/addressform/AddressFormView.fxml +++ b/examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/addressform/AddressFormView.fxml @@ -17,7 +17,7 @@ + fx:controller="de.saxsys.mvvmfx.examples.contacts.ui.addressform.AddressFormView"> + fx:controller="de.saxsys.mvvmfx.examples.contacts.ui.contactdialog.ContactDialogView"> diff --git a/examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/contactform/ContactFormView.fxml b/examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/contactform/ContactFormView.fxml similarity index 98% rename from examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/contactform/ContactFormView.fxml rename to examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/contactform/ContactFormView.fxml index b108acee5..6febba9c8 100644 --- a/examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/contactform/ContactFormView.fxml +++ b/examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/contactform/ContactFormView.fxml @@ -17,7 +17,7 @@ + fx:controller="de.saxsys.mvvmfx.examples.contacts.ui.contactform.ContactFormView"> + fx:controller="de.saxsys.mvvmfx.examples.contacts.ui.detail.DetailView"> diff --git a/examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/editcontact/EditContactDialog.fxml b/examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/editcontact/EditContactDialog.fxml similarity index 100% rename from examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/editcontact/EditContactDialog.fxml rename to examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/editcontact/EditContactDialog.fxml diff --git a/examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/main/MainView.fxml b/examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/main/MainView.fxml similarity index 93% rename from examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/main/MainView.fxml rename to examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/main/MainView.fxml index 9a58db92f..f0edc11a7 100644 --- a/examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/main/MainView.fxml +++ b/examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/main/MainView.fxml @@ -5,7 +5,7 @@ + fx:controller="de.saxsys.mvvmfx.examples.contacts.ui.main.MainView"> diff --git a/examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/master/MasterView.fxml b/examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/master/MasterView.fxml similarity index 96% rename from examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/master/MasterView.fxml rename to examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/master/MasterView.fxml index 94dbfeb54..9a50cbac7 100644 --- a/examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/master/MasterView.fxml +++ b/examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/master/MasterView.fxml @@ -10,7 +10,7 @@ + fx:controller="de.saxsys.mvvmfx.examples.contacts.ui.master.MasterView"> diff --git a/examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/menu/MenuView.fxml b/examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/menu/MenuView.fxml similarity index 93% rename from examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/menu/MenuView.fxml rename to examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/menu/MenuView.fxml index a0f7d9d03..abab1b1ba 100644 --- a/examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/menu/MenuView.fxml +++ b/examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/menu/MenuView.fxml @@ -6,7 +6,7 @@ + fx:controller="de.saxsys.mvvmfx.examples.contacts.ui.menu.MenuView"> diff --git a/examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/toolbar/ToolbarView.fxml b/examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/toolbar/ToolbarView.fxml similarity index 90% rename from examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/toolbar/ToolbarView.fxml rename to examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/toolbar/ToolbarView.fxml index 4968fa384..0cf2a805c 100644 --- a/examples/mvvmfx-contacts/src/main/resources/de/saxsys/mvvmfx/contacts/ui/toolbar/ToolbarView.fxml +++ b/examples/contacts-example/src/main/resources/de/saxsys/mvvmfx/examples/contacts/ui/toolbar/ToolbarView.fxml @@ -9,7 +9,7 @@ + fx:controller="de.saxsys.mvvmfx.examples.contacts.ui.toolbar.ToolbarView"> diff --git a/examples/mvvmfx-contacts/src/main/resources/default_de.properties b/examples/contacts-example/src/main/resources/default_de.properties similarity index 100% rename from examples/mvvmfx-contacts/src/main/resources/default_de.properties rename to examples/contacts-example/src/main/resources/default_de.properties diff --git a/examples/mvvmfx-contacts/src/main/resources/default_en.properties b/examples/contacts-example/src/main/resources/default_en.properties similarity index 100% rename from examples/mvvmfx-contacts/src/main/resources/default_en.properties rename to examples/contacts-example/src/main/resources/default_en.properties diff --git a/examples/mvvmfx-contacts/src/main/resources/logback.xml b/examples/contacts-example/src/main/resources/logback.xml similarity index 100% rename from examples/mvvmfx-contacts/src/main/resources/logback.xml rename to examples/contacts-example/src/main/resources/logback.xml diff --git a/examples/mvvmfx-contacts/src/main/resources/menu_de.properties b/examples/contacts-example/src/main/resources/menu_de.properties similarity index 100% rename from examples/mvvmfx-contacts/src/main/resources/menu_de.properties rename to examples/contacts-example/src/main/resources/menu_de.properties diff --git a/examples/mvvmfx-contacts/src/main/resources/menu_en.properties b/examples/contacts-example/src/main/resources/menu_en.properties similarity index 100% rename from examples/mvvmfx-contacts/src/main/resources/menu_en.properties rename to examples/contacts-example/src/main/resources/menu_en.properties diff --git a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/AppTestFxIT.java b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/AppTestFxIT.java similarity index 91% rename from examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/AppTestFxIT.java rename to examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/AppTestFxIT.java index 9a434e2c0..9ae81afe6 100644 --- a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/AppTestFxIT.java +++ b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/AppTestFxIT.java @@ -1,5 +1,6 @@ -package de.saxsys.mvvmfx.contacts; +package de.saxsys.mvvmfx.examples.contacts; +import de.saxsys.mvvmfx.examples.contacts.App; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; diff --git a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/model/CountrySelectorIntegrationTest.java b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/model/CountrySelectorIntegrationTest.java similarity index 99% rename from examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/model/CountrySelectorIntegrationTest.java rename to examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/model/CountrySelectorIntegrationTest.java index 858b74476..4eb59fe28 100644 --- a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/model/CountrySelectorIntegrationTest.java +++ b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/model/CountrySelectorIntegrationTest.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.model; +package de.saxsys.mvvmfx.examples.contacts.model; import de.saxsys.javafx.test.JfxRunner; import javafx.application.Platform; diff --git a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/model/validation/BirthdayValidatorTest.java b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/model/validation/BirthdayValidatorTest.java similarity index 87% rename from examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/model/validation/BirthdayValidatorTest.java rename to examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/model/validation/BirthdayValidatorTest.java index f10141d74..b3aa05d54 100644 --- a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/model/validation/BirthdayValidatorTest.java +++ b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/model/validation/BirthdayValidatorTest.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.model.validation; +package de.saxsys.mvvmfx.examples.contacts.model.validation; import static org.assertj.core.api.Assertions.*; @@ -8,7 +8,7 @@ import java.time.ZoneId; import java.time.ZonedDateTime; -import de.saxsys.mvvmfx.contacts.ui.validators.BirthdayValidator; +import de.saxsys.mvvmfx.examples.contacts.ui.validators.BirthdayValidator; import de.saxsys.mvvmfx.utils.validation.Validator; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; @@ -16,7 +16,7 @@ import org.junit.Before; import org.junit.Test; -import de.saxsys.mvvmfx.contacts.util.CentralClock; +import de.saxsys.mvvmfx.examples.contacts.util.CentralClock; import de.saxsys.mvvmfx.utils.validation.ValidationStatus; @@ -30,7 +30,7 @@ public class BirthdayValidatorTest { public void setup() { ZonedDateTime now = ZonedDateTime .of(LocalDate.of(2014, Month.JANUARY, 1), LocalTime.of(0, 0), ZoneId.systemDefault()); - + CentralClock.setFixedClock(now); Validator validator = new BirthdayValidator(value); diff --git a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/model/validation/EmailAddressValidatorTest.java b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/model/validation/EmailAddressValidatorTest.java similarity index 88% rename from examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/model/validation/EmailAddressValidatorTest.java rename to examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/model/validation/EmailAddressValidatorTest.java index 61d11267e..dd46ee059 100644 --- a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/model/validation/EmailAddressValidatorTest.java +++ b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/model/validation/EmailAddressValidatorTest.java @@ -1,8 +1,8 @@ -package de.saxsys.mvvmfx.contacts.model.validation; +package de.saxsys.mvvmfx.examples.contacts.model.validation; import static org.assertj.core.api.Assertions.*; -import de.saxsys.mvvmfx.contacts.ui.validators.EmailValidator; +import de.saxsys.mvvmfx.examples.contacts.ui.validators.EmailValidator; import de.saxsys.mvvmfx.utils.validation.Validator; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; @@ -36,7 +36,7 @@ public void testValidationOfEmail() { value.set("darthvader.imperium.org"); // wrong email format assertThat(result.isValid()).isFalse(); - + value.set(null); assertThat(result.isValid()).isFalse(); diff --git a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/model/validation/PhoneNumberValidatorTest.java b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/model/validation/PhoneNumberValidatorTest.java similarity index 78% rename from examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/model/validation/PhoneNumberValidatorTest.java rename to examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/model/validation/PhoneNumberValidatorTest.java index 1ba1cd212..3696f770b 100644 --- a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/model/validation/PhoneNumberValidatorTest.java +++ b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/model/validation/PhoneNumberValidatorTest.java @@ -1,8 +1,8 @@ -package de.saxsys.mvvmfx.contacts.model.validation; +package de.saxsys.mvvmfx.examples.contacts.model.validation; import static org.assertj.core.api.Assertions.*; -import de.saxsys.mvvmfx.contacts.ui.validators.PhoneValidator; +import de.saxsys.mvvmfx.examples.contacts.ui.validators.PhoneValidator; import de.saxsys.mvvmfx.utils.validation.Validator; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; @@ -30,13 +30,13 @@ public void setup() { public void testPhoneNumber() { // phone number is not mandatory value.set(""); - assertThat(result.isValid()).isTrue(); + assertThat(result.isValid()).isTrue(); value.set(null); - assertThat(result.isValid()).isTrue(); + assertThat(result.isValid()).isTrue(); value.set(" "); - assertThat(result.isValid()).isTrue(); - - + assertThat(result.isValid()).isTrue(); + + value.set("012345678"); assertThat(result.isValid()).isTrue(); diff --git a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/about/AboutViewModelTest.java b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/about/AboutViewModelTest.java similarity index 97% rename from examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/about/AboutViewModelTest.java rename to examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/about/AboutViewModelTest.java index 8c6821d3d..8103babec 100644 --- a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/about/AboutViewModelTest.java +++ b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/about/AboutViewModelTest.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.ui.about; +package de.saxsys.mvvmfx.examples.contacts.ui.about; import static eu.lestard.assertj.javafx.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/addressform/AddressFormViewModelTest.java b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/addressform/AddressFormViewModelTest.java similarity index 94% rename from examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/addressform/AddressFormViewModelTest.java rename to examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/addressform/AddressFormViewModelTest.java index 838b6eae7..008df2a7a 100644 --- a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/addressform/AddressFormViewModelTest.java +++ b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/addressform/AddressFormViewModelTest.java @@ -1,7 +1,7 @@ -package de.saxsys.mvvmfx.contacts.ui.addressform; +package de.saxsys.mvvmfx.examples.contacts.ui.addressform; -import static de.saxsys.mvvmfx.contacts.ui.addressform.AddressFormViewModel.NOTHING_SELECTED_MARKER; -import static de.saxsys.mvvmfx.contacts.ui.addressform.AddressFormViewModel.SUBDIVISION_LABEL_KEY; +import static de.saxsys.mvvmfx.examples.contacts.ui.addressform.AddressFormViewModel.NOTHING_SELECTED_MARKER; +import static de.saxsys.mvvmfx.examples.contacts.ui.addressform.AddressFormViewModel.SUBDIVISION_LABEL_KEY; import static eu.lestard.assertj.javafx.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doAnswer; @@ -19,9 +19,9 @@ import org.junit.Before; import org.junit.Test; -import de.saxsys.mvvmfx.contacts.model.Country; -import de.saxsys.mvvmfx.contacts.model.CountrySelector; -import de.saxsys.mvvmfx.contacts.model.Subdivision; +import de.saxsys.mvvmfx.examples.contacts.model.Country; +import de.saxsys.mvvmfx.examples.contacts.model.CountrySelector; +import de.saxsys.mvvmfx.examples.contacts.model.Subdivision; public class AddressFormViewModelTest { diff --git a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/contactdialog/ContactDialogViewModelTest.java b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/contactdialog/ContactDialogViewModelTest.java similarity index 95% rename from examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/contactdialog/ContactDialogViewModelTest.java rename to examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/contactdialog/ContactDialogViewModelTest.java index 47dd6e13c..976843bf4 100644 --- a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/contactdialog/ContactDialogViewModelTest.java +++ b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/contactdialog/ContactDialogViewModelTest.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.ui.contactdialog; +package de.saxsys.mvvmfx.examples.contacts.ui.contactdialog; import static eu.lestard.assertj.javafx.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -10,8 +10,8 @@ import org.junit.Before; import org.junit.Test; -import de.saxsys.mvvmfx.contacts.ui.addressform.AddressFormViewModel; -import de.saxsys.mvvmfx.contacts.ui.contactform.ContactFormViewModel; +import de.saxsys.mvvmfx.examples.contacts.ui.addressform.AddressFormViewModel; +import de.saxsys.mvvmfx.examples.contacts.ui.contactform.ContactFormViewModel; public class ContactDialogViewModelTest { diff --git a/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/contactdialog/ContactFormViewModelTest.java b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/contactdialog/ContactFormViewModelTest.java new file mode 100644 index 000000000..259d004ad --- /dev/null +++ b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/contactdialog/ContactFormViewModelTest.java @@ -0,0 +1,60 @@ +package de.saxsys.mvvmfx.examples.contacts.ui.contactdialog; + +import de.saxsys.mvvmfx.examples.contacts.ui.contactform.ContactFormViewModel; +import de.saxsys.mvvmfx.testingutils.GCVerifier; +import org.junit.Before; +import org.junit.Test; + +import static eu.lestard.assertj.javafx.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; + +public class ContactFormViewModelTest { + + private ContactFormViewModel viewModel; + + @Before + public void setup() { + viewModel = new ContactFormViewModel(); + } + + + @Test + public void testFirstname() { + + assertThat(viewModel.firstnameValidation().getErrorMessages()).hasSize(1); + assertThat(viewModel.firstnameValidation().validProperty()).isFalse(); + + + viewModel.firstnameProperty().set("Horst"); + + assertThat(viewModel.firstnameValidation().validProperty()).isTrue(); + assertThat(viewModel.firstnameValidation().getErrorMessages()).isEmpty(); + + + viewModel.firstnameProperty().setValue(""); + assertThat(viewModel.firstnameValidation().getErrorMessages()).hasSize(1); + assertThat(viewModel.firstnameValidation().validProperty()).isFalse(); + } + + @Test + public void testEmail() { + GCVerifier.forceGC(); + + + assertThat(viewModel.emailValidation().getMessages()).hasSize(2); + assertThat(viewModel.emailValidation().validProperty()).isFalse(); + + viewModel.emailProperty().set("Something"); + + assertThat(viewModel.emailValidation().getMessages()).hasSize(1); + assertThat(viewModel.emailValidation().validProperty()).isFalse(); + + viewModel.emailProperty().set("test@example.org"); + + assertThat(viewModel.emailValidation().getMessages()).isEmpty(); + assertThat(viewModel.emailValidation().validProperty()).isTrue(); + } + + + +} diff --git a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/detail/DetailViewModelTest.java b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/detail/DetailViewModelTest.java similarity index 95% rename from examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/detail/DetailViewModelTest.java rename to examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/detail/DetailViewModelTest.java index 6ac074692..0f40b9488 100644 --- a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/detail/DetailViewModelTest.java +++ b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/detail/DetailViewModelTest.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.ui.detail; +package de.saxsys.mvvmfx.examples.contacts.ui.detail; import static eu.lestard.assertj.javafx.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -7,15 +7,15 @@ import java.time.LocalDate; -import de.saxsys.mvvmfx.contacts.model.Repository; +import de.saxsys.mvvmfx.examples.contacts.model.Repository; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; import org.junit.Before; import org.junit.Test; -import de.saxsys.mvvmfx.contacts.model.Contact; -import de.saxsys.mvvmfx.contacts.ui.master.MasterViewModel; +import de.saxsys.mvvmfx.examples.contacts.model.Contact; +import de.saxsys.mvvmfx.examples.contacts.ui.master.MasterViewModel; public class DetailViewModelTest { diff --git a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/editcontact/EditContactDialogViewModelTest.java b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/editcontact/EditContactDialogViewModelTest.java similarity index 83% rename from examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/editcontact/EditContactDialogViewModelTest.java rename to examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/editcontact/EditContactDialogViewModelTest.java index ce814f9ba..9c8799583 100644 --- a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/editcontact/EditContactDialogViewModelTest.java +++ b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/editcontact/EditContactDialogViewModelTest.java @@ -1,10 +1,10 @@ -package de.saxsys.mvvmfx.contacts.ui.editcontact; +package de.saxsys.mvvmfx.examples.contacts.ui.editcontact; -import de.saxsys.mvvmfx.contacts.model.Contact; -import de.saxsys.mvvmfx.contacts.model.Repository; -import de.saxsys.mvvmfx.contacts.ui.addressform.AddressFormViewModel; -import de.saxsys.mvvmfx.contacts.ui.contactdialog.ContactDialogViewModel; -import de.saxsys.mvvmfx.contacts.ui.contactform.ContactFormViewModel; +import de.saxsys.mvvmfx.examples.contacts.model.Contact; +import de.saxsys.mvvmfx.examples.contacts.model.Repository; +import de.saxsys.mvvmfx.examples.contacts.ui.addressform.AddressFormViewModel; +import de.saxsys.mvvmfx.examples.contacts.ui.contactdialog.ContactDialogViewModel; +import de.saxsys.mvvmfx.examples.contacts.ui.contactform.ContactFormViewModel; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleStringProperty; import org.junit.Before; @@ -14,7 +14,7 @@ import java.util.Optional; import java.util.ResourceBundle; -import static de.saxsys.mvvmfx.contacts.ui.editcontact.EditContactDialogViewModel.TITLE_LABEL_KEY; +import static de.saxsys.mvvmfx.examples.contacts.ui.editcontact.EditContactDialogViewModel.TITLE_LABEL_KEY; import static eu.lestard.assertj.javafx.api.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; diff --git a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/master/MasterTableViewModelTest.java b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/master/MasterTableViewModelTest.java similarity index 81% rename from examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/master/MasterTableViewModelTest.java rename to examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/master/MasterTableViewModelTest.java index c92d40074..d0689e939 100644 --- a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/master/MasterTableViewModelTest.java +++ b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/master/MasterTableViewModelTest.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.ui.master; +package de.saxsys.mvvmfx.examples.contacts.ui.master; import static org.assertj.core.api.Assertions.*; @@ -10,8 +10,8 @@ import org.junit.Test; -import de.saxsys.mvvmfx.contacts.model.Contact; -import de.saxsys.mvvmfx.contacts.util.CentralClock; +import de.saxsys.mvvmfx.examples.contacts.model.Contact; +import de.saxsys.mvvmfx.examples.contacts.util.CentralClock; public class MasterTableViewModelTest { diff --git a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/master/MasterViewModelTest.java b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/master/MasterViewModelTest.java similarity index 81% rename from examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/master/MasterViewModelTest.java rename to examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/master/MasterViewModelTest.java index 1a656bee9..ac5d537d5 100644 --- a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/master/MasterViewModelTest.java +++ b/examples/contacts-example/src/test/java/de/saxsys/mvvmfx/examples/contacts/ui/master/MasterViewModelTest.java @@ -1,4 +1,4 @@ -package de.saxsys.mvvmfx.contacts.ui.master; +package de.saxsys.mvvmfx.examples.contacts.ui.master; import static eu.lestard.assertj.javafx.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat; @@ -14,11 +14,11 @@ import org.junit.Before; import org.junit.Test; -import de.saxsys.mvvmfx.contacts.events.ContactsUpdatedEvent; -import de.saxsys.mvvmfx.contacts.model.Contact; -import de.saxsys.mvvmfx.contacts.model.ContactFactory; -import de.saxsys.mvvmfx.contacts.model.InmemoryRepository; -import de.saxsys.mvvmfx.contacts.model.Repository; +import de.saxsys.mvvmfx.examples.contacts.events.ContactsUpdatedEvent; +import de.saxsys.mvvmfx.examples.contacts.model.Contact; +import de.saxsys.mvvmfx.examples.contacts.model.ContactFactory; +import de.saxsys.mvvmfx.examples.contacts.model.InmemoryRepository; +import de.saxsys.mvvmfx.examples.contacts.model.Repository; @SuppressWarnings("unchecked") public class MasterViewModelTest { @@ -143,12 +143,12 @@ public void testUpdateContactListNoSelectionWhenSelectedItemIsRemoved() { /** * This helper extracts the IDs of all Contact rows in that are shown in the TableView. * - * The TableView doesn't directly show instances of {@link de.saxsys.mvvmfx.contacts.model.Contact} but instead - * contains instances of {@link de.saxsys.mvvmfx.contacts.ui.master.MasterTableViewModel}. + * The TableView doesn't directly show instances of {@link de.saxsys.mvvmfx.examples.contacts.model.Contact} but + * instead contains instances of {@link de.saxsys.mvvmfx.examples.contacts.ui.master.MasterTableViewModel}. * - * Every {@link de.saxsys.mvvmfx.contacts.ui.master.MasterTableViewModel} has an ID attribute corresponding to the - * ID of the contact that is shown. This method extracts these IDs and returns them as List. This way we can verify - * what Contacts are shown in the Table. + * Every {@link de.saxsys.mvvmfx.examples.contacts.ui.master.MasterTableViewModel} has an ID attribute corresponding + * to the ID of the contact that is shown. This method extracts these IDs and returns them as List. This way we can + * verify what Contacts are shown in the Table. */ private List getContactIdsInTable() { return viewModel.contactList().stream().map(MasterTableViewModel::getId).collect( @@ -156,8 +156,8 @@ private List getContactIdsInTable() { } /** - * Returns the {@link de.saxsys.mvvmfx.contacts.ui.master.MasterTableViewModel} for the given - * {@link de.saxsys.mvvmfx.contacts.model.Contact} from the contact list. + * Returns the {@link de.saxsys.mvvmfx.examples.contacts.ui.master.MasterTableViewModel} for the given + * {@link de.saxsys.mvvmfx.examples.contacts.model.Contact} from the contact list. */ private MasterTableViewModel findTableViewModelForContact(Contact contact) { return viewModel.contactList().stream().filter(row -> row.getId().equals(contact.getId())).findFirst().get(); diff --git a/examples/mvvmfx-contacts/src/test/resources/countries/iso_3166.xml b/examples/contacts-example/src/test/resources/countries/iso_3166.xml similarity index 100% rename from examples/mvvmfx-contacts/src/test/resources/countries/iso_3166.xml rename to examples/contacts-example/src/test/resources/countries/iso_3166.xml diff --git a/examples/mvvmfx-contacts/src/test/resources/countries/iso_3166_2.xml b/examples/contacts-example/src/test/resources/countries/iso_3166_2.xml similarity index 100% rename from examples/mvvmfx-contacts/src/test/resources/countries/iso_3166_2.xml rename to examples/contacts-example/src/test/resources/countries/iso_3166_2.xml diff --git a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/contactdialog/ContactFormViewModelTest.java b/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/contactdialog/ContactFormViewModelTest.java deleted file mode 100644 index 0d7bfff90..000000000 --- a/examples/mvvmfx-contacts/src/test/java/de/saxsys/mvvmfx/contacts/ui/contactdialog/ContactFormViewModelTest.java +++ /dev/null @@ -1,60 +0,0 @@ -package de.saxsys.mvvmfx.contacts.ui.contactdialog; - -import de.saxsys.mvvmfx.contacts.ui.contactform.ContactFormViewModel; -import de.saxsys.mvvmfx.testingutils.GCVerifier; -import org.junit.Before; -import org.junit.Test; - -import static eu.lestard.assertj.javafx.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThat; - -public class ContactFormViewModelTest { - - private ContactFormViewModel viewModel; - - @Before - public void setup() { - viewModel = new ContactFormViewModel(); - } - - - @Test - public void testFirstname() { - - assertThat(viewModel.firstnameValidation().getErrorMessages()).hasSize(1); - assertThat(viewModel.firstnameValidation().validProperty()).isFalse(); - - - viewModel.firstnameProperty().set("Horst"); - - assertThat(viewModel.firstnameValidation().validProperty()).isTrue(); - assertThat(viewModel.firstnameValidation().getErrorMessages()).isEmpty(); - - - viewModel.firstnameProperty().setValue(""); - assertThat(viewModel.firstnameValidation().getErrorMessages()).hasSize(1); - assertThat(viewModel.firstnameValidation().validProperty()).isFalse(); - } - - @Test - public void testEmail() { - GCVerifier.forceGC(); - - - assertThat(viewModel.emailValidation().getMessages()).hasSize(2); - assertThat(viewModel.emailValidation().validProperty()).isFalse(); - - viewModel.emailProperty().set("Something"); - - assertThat(viewModel.emailValidation().getMessages()).hasSize(1); - assertThat(viewModel.emailValidation().validProperty()).isFalse(); - - viewModel.emailProperty().set("test@example.org"); - - assertThat(viewModel.emailValidation().getMessages()).isEmpty(); - assertThat(viewModel.emailValidation().validProperty()).isTrue(); - } - - - -} diff --git a/examples/pom.xml b/examples/pom.xml index 90883cca0..0b25cdd5f 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ mvvmfx-helloworld mvvmfx-helloworld-without-fxml mvvmfx-synchronizefx - mvvmfx-contacts + contacts-example books-example mvvmfx-todomvc @@ -66,7 +66,7 @@ de.saxsys.mvvmfx - mvvmfx-contacts + contacts-example ${project.version} From 8b930b7f955610a835d6df26aff59dfe4ec3d893 Mon Sep 17 00:00:00 2001 From: Manuel Mauky Date: Thu, 2 Jul 2015 13:45:34 +0200 Subject: [PATCH 10/33] #217 renamed todomvc-example module --- examples/pom.xml | 4 ++-- examples/{mvvmfx-todomvc => todomvc-example}/pom.xml | 2 +- .../src/main/java/de/saxsys/mvvmfx/example/todomvc/App.java | 0 .../java/de/saxsys/mvvmfx/example/todomvc/model/TodoItem.java | 0 .../de/saxsys/mvvmfx/example/todomvc/model/TodoItemStore.java | 0 .../de/saxsys/mvvmfx/example/todomvc/ui/FilterHelper.java | 0 .../java/de/saxsys/mvvmfx/example/todomvc/ui/MainView.java | 0 .../de/saxsys/mvvmfx/example/todomvc/ui/MainViewModel.java | 0 .../mvvmfx/example/todomvc/ui/additems/AddItemsView.java | 0 .../mvvmfx/example/todomvc/ui/additems/AddItemsViewModel.java | 0 .../mvvmfx/example/todomvc/ui/controls/ControlsView.java | 0 .../mvvmfx/example/todomvc/ui/controls/ControlsViewModel.java | 0 .../mvvmfx/example/todomvc/ui/item/ItemOverviewView.java | 0 .../mvvmfx/example/todomvc/ui/item/ItemOverviewViewModel.java | 0 .../de/saxsys/mvvmfx/example/todomvc/ui/item/ItemView.java | 0 .../saxsys/mvvmfx/example/todomvc/ui/item/ItemViewModel.java | 0 .../de/saxsys/mvvmfx/example/todomvc/ui/MainView.fxml | 0 .../mvvmfx/example/todomvc/ui/additems/AddItemsView.fxml | 0 .../de/saxsys/mvvmfx/example/todomvc/ui/additems/additems.css | 0 .../mvvmfx/example/todomvc/ui/controls/ControlsView.fxml | 0 .../mvvmfx/example/todomvc/ui/item/ItemOverviewView.fxml | 0 .../de/saxsys/mvvmfx/example/todomvc/ui/item/ItemView.fxml | 0 .../de/saxsys/mvvmfx/example/todomvc/ui/item/itemview.css | 0 .../resources/de/saxsys/mvvmfx/example/todomvc/ui/main.css | 0 24 files changed, 3 insertions(+), 3 deletions(-) rename examples/{mvvmfx-todomvc => todomvc-example}/pom.xml (95%) rename examples/{mvvmfx-todomvc => todomvc-example}/src/main/java/de/saxsys/mvvmfx/example/todomvc/App.java (100%) rename examples/{mvvmfx-todomvc => todomvc-example}/src/main/java/de/saxsys/mvvmfx/example/todomvc/model/TodoItem.java (100%) rename examples/{mvvmfx-todomvc => todomvc-example}/src/main/java/de/saxsys/mvvmfx/example/todomvc/model/TodoItemStore.java (100%) rename examples/{mvvmfx-todomvc => todomvc-example}/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/FilterHelper.java (100%) rename examples/{mvvmfx-todomvc => todomvc-example}/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/MainView.java (100%) rename examples/{mvvmfx-todomvc => todomvc-example}/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/MainViewModel.java (100%) rename examples/{mvvmfx-todomvc => todomvc-example}/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/additems/AddItemsView.java (100%) rename examples/{mvvmfx-todomvc => todomvc-example}/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/additems/AddItemsViewModel.java (100%) rename examples/{mvvmfx-todomvc => todomvc-example}/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/controls/ControlsView.java (100%) rename examples/{mvvmfx-todomvc => todomvc-example}/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/controls/ControlsViewModel.java (100%) rename examples/{mvvmfx-todomvc => todomvc-example}/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemOverviewView.java (100%) rename examples/{mvvmfx-todomvc => todomvc-example}/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemOverviewViewModel.java (100%) rename examples/{mvvmfx-todomvc => todomvc-example}/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemView.java (100%) rename examples/{mvvmfx-todomvc => todomvc-example}/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemViewModel.java (100%) rename examples/{mvvmfx-todomvc => todomvc-example}/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/MainView.fxml (100%) rename examples/{mvvmfx-todomvc => todomvc-example}/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/additems/AddItemsView.fxml (100%) rename examples/{mvvmfx-todomvc => todomvc-example}/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/additems/additems.css (100%) rename examples/{mvvmfx-todomvc => todomvc-example}/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/controls/ControlsView.fxml (100%) rename examples/{mvvmfx-todomvc => todomvc-example}/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemOverviewView.fxml (100%) rename examples/{mvvmfx-todomvc => todomvc-example}/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemView.fxml (100%) rename examples/{mvvmfx-todomvc => todomvc-example}/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/item/itemview.css (100%) rename examples/{mvvmfx-todomvc => todomvc-example}/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/main.css (100%) diff --git a/examples/pom.xml b/examples/pom.xml index 0b25cdd5f..c89f33836 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -23,7 +23,7 @@ mvvmfx-synchronizefx contacts-example books-example - mvvmfx-todomvc + todomvc-example @@ -76,7 +76,7 @@ de.saxsys.mvvmfx - mvvmfx-todomvc + todomvc-example ${project.version} diff --git a/examples/mvvmfx-todomvc/pom.xml b/examples/todomvc-example/pom.xml similarity index 95% rename from examples/mvvmfx-todomvc/pom.xml rename to examples/todomvc-example/pom.xml index cb2aa2d3d..d3499fd9c 100644 --- a/examples/mvvmfx-todomvc/pom.xml +++ b/examples/todomvc-example/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - mvvmfx-todomvc + todomvc-example diff --git a/examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/App.java b/examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/App.java similarity index 100% rename from examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/App.java rename to examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/App.java diff --git a/examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/model/TodoItem.java b/examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/model/TodoItem.java similarity index 100% rename from examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/model/TodoItem.java rename to examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/model/TodoItem.java diff --git a/examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/model/TodoItemStore.java b/examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/model/TodoItemStore.java similarity index 100% rename from examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/model/TodoItemStore.java rename to examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/model/TodoItemStore.java diff --git a/examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/FilterHelper.java b/examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/FilterHelper.java similarity index 100% rename from examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/FilterHelper.java rename to examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/FilterHelper.java diff --git a/examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/MainView.java b/examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/MainView.java similarity index 100% rename from examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/MainView.java rename to examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/MainView.java diff --git a/examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/MainViewModel.java b/examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/MainViewModel.java similarity index 100% rename from examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/MainViewModel.java rename to examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/MainViewModel.java diff --git a/examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/additems/AddItemsView.java b/examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/additems/AddItemsView.java similarity index 100% rename from examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/additems/AddItemsView.java rename to examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/additems/AddItemsView.java diff --git a/examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/additems/AddItemsViewModel.java b/examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/additems/AddItemsViewModel.java similarity index 100% rename from examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/additems/AddItemsViewModel.java rename to examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/additems/AddItemsViewModel.java diff --git a/examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/controls/ControlsView.java b/examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/controls/ControlsView.java similarity index 100% rename from examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/controls/ControlsView.java rename to examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/controls/ControlsView.java diff --git a/examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/controls/ControlsViewModel.java b/examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/controls/ControlsViewModel.java similarity index 100% rename from examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/controls/ControlsViewModel.java rename to examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/controls/ControlsViewModel.java diff --git a/examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemOverviewView.java b/examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemOverviewView.java similarity index 100% rename from examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemOverviewView.java rename to examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemOverviewView.java diff --git a/examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemOverviewViewModel.java b/examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemOverviewViewModel.java similarity index 100% rename from examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemOverviewViewModel.java rename to examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemOverviewViewModel.java diff --git a/examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemView.java b/examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemView.java similarity index 100% rename from examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemView.java rename to examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemView.java diff --git a/examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemViewModel.java b/examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemViewModel.java similarity index 100% rename from examples/mvvmfx-todomvc/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemViewModel.java rename to examples/todomvc-example/src/main/java/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemViewModel.java diff --git a/examples/mvvmfx-todomvc/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/MainView.fxml b/examples/todomvc-example/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/MainView.fxml similarity index 100% rename from examples/mvvmfx-todomvc/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/MainView.fxml rename to examples/todomvc-example/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/MainView.fxml diff --git a/examples/mvvmfx-todomvc/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/additems/AddItemsView.fxml b/examples/todomvc-example/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/additems/AddItemsView.fxml similarity index 100% rename from examples/mvvmfx-todomvc/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/additems/AddItemsView.fxml rename to examples/todomvc-example/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/additems/AddItemsView.fxml diff --git a/examples/mvvmfx-todomvc/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/additems/additems.css b/examples/todomvc-example/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/additems/additems.css similarity index 100% rename from examples/mvvmfx-todomvc/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/additems/additems.css rename to examples/todomvc-example/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/additems/additems.css diff --git a/examples/mvvmfx-todomvc/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/controls/ControlsView.fxml b/examples/todomvc-example/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/controls/ControlsView.fxml similarity index 100% rename from examples/mvvmfx-todomvc/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/controls/ControlsView.fxml rename to examples/todomvc-example/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/controls/ControlsView.fxml diff --git a/examples/mvvmfx-todomvc/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemOverviewView.fxml b/examples/todomvc-example/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemOverviewView.fxml similarity index 100% rename from examples/mvvmfx-todomvc/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemOverviewView.fxml rename to examples/todomvc-example/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemOverviewView.fxml diff --git a/examples/mvvmfx-todomvc/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemView.fxml b/examples/todomvc-example/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemView.fxml similarity index 100% rename from examples/mvvmfx-todomvc/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemView.fxml rename to examples/todomvc-example/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/item/ItemView.fxml diff --git a/examples/mvvmfx-todomvc/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/item/itemview.css b/examples/todomvc-example/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/item/itemview.css similarity index 100% rename from examples/mvvmfx-todomvc/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/item/itemview.css rename to examples/todomvc-example/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/item/itemview.css diff --git a/examples/mvvmfx-todomvc/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/main.css b/examples/todomvc-example/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/main.css similarity index 100% rename from examples/mvvmfx-todomvc/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/main.css rename to examples/todomvc-example/src/main/resources/de/saxsys/mvvmfx/example/todomvc/ui/main.css From 6ddd78e7168ea78e7770a285ebb88162ca62b505 Mon Sep 17 00:00:00 2001 From: Manuel Mauky Date: Thu, 2 Jul 2015 15:02:04 +0200 Subject: [PATCH 11/33] #217 moved mini example modules --- .../fx-root-example}/README.md | 0 .../fx-root-example}/pom.xml | 16 ++++++------ .../fx_root_example/LabeledTextField.java | 2 +- .../LabeledTextFieldViewModel.java | 0 .../jfx/mvvmfx/fx_root_example/Starter.java | 0 .../fx_root_example/LabeledTextField.fxml | 0 .../IntegrationTestWithTestFX.java | 5 ++-- .../fx_root_example/LabeledTextFieldTest.java | 0 .../helloworld-without-fxml}/pom.xml | 22 +++++++--------- .../jfx/mvvmfx/helloworld/HelloWorldView.java | 0 .../helloworld/HelloWorldViewModel.java | 0 .../saxsys/jfx/mvvmfx/helloworld/Starter.java | 0 .../helloworld}/README.md | 0 .../helloworld}/pom.xml | 20 +++++++-------- .../jfx/mvvmfx/helloworld/HelloWorldView.java | 0 .../helloworld/HelloWorldViewModel.java | 0 .../saxsys/jfx/mvvmfx/helloworld/Starter.java | 0 .../jfx/mvvmfx/helloworld/HelloWorldView.fxml | 0 examples/mini-examples/pom.xml | 25 +++++++++++++++++++ .../synchronizefx-example}/README.md | 0 .../synchronizefx-example}/pom.xml | 17 ++++++++----- .../examples/synchronize/ClientApp.java | 0 .../examples/synchronize/ServerApp.java | 0 .../examples/synchronize/SliderView.java | 1 + .../examples/synchronize/SliderViewModel.java | 3 ++- .../examples/synchronize/SliderView.fxml | 0 examples/pom.xml | 18 +++++++------ 27 files changed, 80 insertions(+), 49 deletions(-) rename examples/{mvvmfx-fx-root-example => mini-examples/fx-root-example}/README.md (100%) rename examples/{mvvmfx-fx-root-example => mini-examples/fx-root-example}/pom.xml (82%) rename examples/{mvvmfx-fx-root-example => mini-examples/fx-root-example}/src/main/java/de/saxsys/jfx/mvvmfx/fx_root_example/LabeledTextField.java (100%) rename examples/{mvvmfx-fx-root-example => mini-examples/fx-root-example}/src/main/java/de/saxsys/jfx/mvvmfx/fx_root_example/LabeledTextFieldViewModel.java (100%) rename examples/{mvvmfx-fx-root-example => mini-examples/fx-root-example}/src/main/java/de/saxsys/jfx/mvvmfx/fx_root_example/Starter.java (100%) rename examples/{mvvmfx-fx-root-example => mini-examples/fx-root-example}/src/main/resources/de/saxsys/jfx/mvvmfx/fx_root_example/LabeledTextField.fxml (100%) rename examples/{mvvmfx-fx-root-example => mini-examples/fx-root-example}/src/test/java/de/saxsys/jfx/mvvmfx/fx_root_example/IntegrationTestWithTestFX.java (99%) rename examples/{mvvmfx-fx-root-example => mini-examples/fx-root-example}/src/test/java/de/saxsys/jfx/mvvmfx/fx_root_example/LabeledTextFieldTest.java (100%) rename examples/{mvvmfx-helloworld-without-fxml => mini-examples/helloworld-without-fxml}/pom.xml (50%) rename examples/{mvvmfx-helloworld-without-fxml => mini-examples/helloworld-without-fxml}/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldView.java (100%) rename examples/{mvvmfx-helloworld-without-fxml => mini-examples/helloworld-without-fxml}/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldViewModel.java (100%) rename examples/{mvvmfx-helloworld-without-fxml => mini-examples/helloworld-without-fxml}/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/Starter.java (100%) rename examples/{mvvmfx-helloworld => mini-examples/helloworld}/README.md (100%) rename examples/{mvvmfx-helloworld => mini-examples/helloworld}/pom.xml (50%) rename examples/{mvvmfx-helloworld => mini-examples/helloworld}/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldView.java (100%) rename examples/{mvvmfx-helloworld => mini-examples/helloworld}/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldViewModel.java (100%) rename examples/{mvvmfx-helloworld => mini-examples/helloworld}/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/Starter.java (100%) rename examples/{mvvmfx-helloworld => mini-examples/helloworld}/src/main/resources/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldView.fxml (100%) create mode 100644 examples/mini-examples/pom.xml rename examples/{mvvmfx-synchronizefx => mini-examples/synchronizefx-example}/README.md (100%) rename examples/{mvvmfx-synchronizefx => mini-examples/synchronizefx-example}/pom.xml (74%) rename examples/{mvvmfx-synchronizefx => mini-examples/synchronizefx-example}/src/main/java/de/saxsys/mvvmfx/examples/synchronize/ClientApp.java (100%) rename examples/{mvvmfx-synchronizefx => mini-examples/synchronizefx-example}/src/main/java/de/saxsys/mvvmfx/examples/synchronize/ServerApp.java (100%) rename examples/{mvvmfx-synchronizefx => mini-examples/synchronizefx-example}/src/main/java/de/saxsys/mvvmfx/examples/synchronize/SliderView.java (99%) rename examples/{mvvmfx-synchronizefx => mini-examples/synchronizefx-example}/src/main/java/de/saxsys/mvvmfx/examples/synchronize/SliderViewModel.java (99%) rename examples/{mvvmfx-synchronizefx => mini-examples/synchronizefx-example}/src/main/resources/de/saxsys/mvvmfx/examples/synchronize/SliderView.fxml (100%) diff --git a/examples/mvvmfx-fx-root-example/README.md b/examples/mini-examples/fx-root-example/README.md similarity index 100% rename from examples/mvvmfx-fx-root-example/README.md rename to examples/mini-examples/fx-root-example/README.md diff --git a/examples/mvvmfx-fx-root-example/pom.xml b/examples/mini-examples/fx-root-example/pom.xml similarity index 82% rename from examples/mvvmfx-fx-root-example/pom.xml rename to examples/mini-examples/fx-root-example/pom.xml index 13529d434..8e66bca1a 100644 --- a/examples/mvvmfx-fx-root-example/pom.xml +++ b/examples/mini-examples/fx-root-example/pom.xml @@ -1,14 +1,16 @@ - + - 4.0.0 - mvvmfx-fx-root-example - Example with fx:root - + mini-examples de.saxsys.mvvmfx - examples 1.4.0-SNAPSHOT + 4.0.0 + + fx-root-example + Example with fx:root UTF-8 @@ -47,4 +49,4 @@ - + \ No newline at end of file diff --git a/examples/mvvmfx-fx-root-example/src/main/java/de/saxsys/jfx/mvvmfx/fx_root_example/LabeledTextField.java b/examples/mini-examples/fx-root-example/src/main/java/de/saxsys/jfx/mvvmfx/fx_root_example/LabeledTextField.java similarity index 100% rename from examples/mvvmfx-fx-root-example/src/main/java/de/saxsys/jfx/mvvmfx/fx_root_example/LabeledTextField.java rename to examples/mini-examples/fx-root-example/src/main/java/de/saxsys/jfx/mvvmfx/fx_root_example/LabeledTextField.java index c7149c072..406de3d98 100644 --- a/examples/mvvmfx-fx-root-example/src/main/java/de/saxsys/jfx/mvvmfx/fx_root_example/LabeledTextField.java +++ b/examples/mini-examples/fx-root-example/src/main/java/de/saxsys/jfx/mvvmfx/fx_root_example/LabeledTextField.java @@ -1,12 +1,12 @@ package de.saxsys.jfx.mvvmfx.fx_root_example; -import de.saxsys.mvvmfx.FluentViewLoader; import javafx.fxml.FXML; import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.control.TextField; import javafx.scene.layout.HBox; +import de.saxsys.mvvmfx.FluentViewLoader; import de.saxsys.mvvmfx.FxmlView; import de.saxsys.mvvmfx.InjectViewModel; diff --git a/examples/mvvmfx-fx-root-example/src/main/java/de/saxsys/jfx/mvvmfx/fx_root_example/LabeledTextFieldViewModel.java b/examples/mini-examples/fx-root-example/src/main/java/de/saxsys/jfx/mvvmfx/fx_root_example/LabeledTextFieldViewModel.java similarity index 100% rename from examples/mvvmfx-fx-root-example/src/main/java/de/saxsys/jfx/mvvmfx/fx_root_example/LabeledTextFieldViewModel.java rename to examples/mini-examples/fx-root-example/src/main/java/de/saxsys/jfx/mvvmfx/fx_root_example/LabeledTextFieldViewModel.java diff --git a/examples/mvvmfx-fx-root-example/src/main/java/de/saxsys/jfx/mvvmfx/fx_root_example/Starter.java b/examples/mini-examples/fx-root-example/src/main/java/de/saxsys/jfx/mvvmfx/fx_root_example/Starter.java similarity index 100% rename from examples/mvvmfx-fx-root-example/src/main/java/de/saxsys/jfx/mvvmfx/fx_root_example/Starter.java rename to examples/mini-examples/fx-root-example/src/main/java/de/saxsys/jfx/mvvmfx/fx_root_example/Starter.java diff --git a/examples/mvvmfx-fx-root-example/src/main/resources/de/saxsys/jfx/mvvmfx/fx_root_example/LabeledTextField.fxml b/examples/mini-examples/fx-root-example/src/main/resources/de/saxsys/jfx/mvvmfx/fx_root_example/LabeledTextField.fxml similarity index 100% rename from examples/mvvmfx-fx-root-example/src/main/resources/de/saxsys/jfx/mvvmfx/fx_root_example/LabeledTextField.fxml rename to examples/mini-examples/fx-root-example/src/main/resources/de/saxsys/jfx/mvvmfx/fx_root_example/LabeledTextField.fxml diff --git a/examples/mvvmfx-fx-root-example/src/test/java/de/saxsys/jfx/mvvmfx/fx_root_example/IntegrationTestWithTestFX.java b/examples/mini-examples/fx-root-example/src/test/java/de/saxsys/jfx/mvvmfx/fx_root_example/IntegrationTestWithTestFX.java similarity index 99% rename from examples/mvvmfx-fx-root-example/src/test/java/de/saxsys/jfx/mvvmfx/fx_root_example/IntegrationTestWithTestFX.java rename to examples/mini-examples/fx-root-example/src/test/java/de/saxsys/jfx/mvvmfx/fx_root_example/IntegrationTestWithTestFX.java index e78e5d877..e7a8a50d8 100644 --- a/examples/mvvmfx-fx-root-example/src/test/java/de/saxsys/jfx/mvvmfx/fx_root_example/IntegrationTestWithTestFX.java +++ b/examples/mini-examples/fx-root-example/src/test/java/de/saxsys/jfx/mvvmfx/fx_root_example/IntegrationTestWithTestFX.java @@ -1,14 +1,15 @@ package de.saxsys.jfx.mvvmfx.fx_root_example; +import static org.loadui.testfx.Assertions.verifyThat; + import javafx.scene.Parent; import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.control.TextField; + import org.junit.Test; import org.loadui.testfx.GuiTest; -import static org.loadui.testfx.Assertions.verifyThat; - public class IntegrationTestWithTestFX extends GuiTest { @Override diff --git a/examples/mvvmfx-fx-root-example/src/test/java/de/saxsys/jfx/mvvmfx/fx_root_example/LabeledTextFieldTest.java b/examples/mini-examples/fx-root-example/src/test/java/de/saxsys/jfx/mvvmfx/fx_root_example/LabeledTextFieldTest.java similarity index 100% rename from examples/mvvmfx-fx-root-example/src/test/java/de/saxsys/jfx/mvvmfx/fx_root_example/LabeledTextFieldTest.java rename to examples/mini-examples/fx-root-example/src/test/java/de/saxsys/jfx/mvvmfx/fx_root_example/LabeledTextFieldTest.java diff --git a/examples/mvvmfx-helloworld-without-fxml/pom.xml b/examples/mini-examples/helloworld-without-fxml/pom.xml similarity index 50% rename from examples/mvvmfx-helloworld-without-fxml/pom.xml rename to examples/mini-examples/helloworld-without-fxml/pom.xml index 595eed38d..f87aecbed 100644 --- a/examples/mvvmfx-helloworld-without-fxml/pom.xml +++ b/examples/mini-examples/helloworld-without-fxml/pom.xml @@ -1,21 +1,16 @@ - + - 4.0.0 - mvvmfx-helloworld-without-fxml - HelloWorld Example without FXML - + mini-examples de.saxsys.mvvmfx - examples 1.4.0-SNAPSHOT + 4.0.0 - - UTF-8 - 1.8 - 1.8 - - + helloworld-without-fxml + HelloWorld Example without FXML @@ -24,4 +19,5 @@ - + + \ No newline at end of file diff --git a/examples/mvvmfx-helloworld-without-fxml/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldView.java b/examples/mini-examples/helloworld-without-fxml/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldView.java similarity index 100% rename from examples/mvvmfx-helloworld-without-fxml/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldView.java rename to examples/mini-examples/helloworld-without-fxml/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldView.java diff --git a/examples/mvvmfx-helloworld-without-fxml/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldViewModel.java b/examples/mini-examples/helloworld-without-fxml/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldViewModel.java similarity index 100% rename from examples/mvvmfx-helloworld-without-fxml/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldViewModel.java rename to examples/mini-examples/helloworld-without-fxml/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldViewModel.java diff --git a/examples/mvvmfx-helloworld-without-fxml/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/Starter.java b/examples/mini-examples/helloworld-without-fxml/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/Starter.java similarity index 100% rename from examples/mvvmfx-helloworld-without-fxml/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/Starter.java rename to examples/mini-examples/helloworld-without-fxml/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/Starter.java diff --git a/examples/mvvmfx-helloworld/README.md b/examples/mini-examples/helloworld/README.md similarity index 100% rename from examples/mvvmfx-helloworld/README.md rename to examples/mini-examples/helloworld/README.md diff --git a/examples/mvvmfx-helloworld/pom.xml b/examples/mini-examples/helloworld/pom.xml similarity index 50% rename from examples/mvvmfx-helloworld/pom.xml rename to examples/mini-examples/helloworld/pom.xml index ff9fae2aa..4f1023bc6 100644 --- a/examples/mvvmfx-helloworld/pom.xml +++ b/examples/mini-examples/helloworld/pom.xml @@ -1,19 +1,16 @@ - + - 4.0.0 - mvvmfx-helloworld - HelloWorld Example + mini-examples de.saxsys.mvvmfx - examples 1.4.0-SNAPSHOT - - UTF-8 - 1.8 - 1.8 - + 4.0.0 + helloworld + HelloWorld Example @@ -22,4 +19,5 @@ - + + \ No newline at end of file diff --git a/examples/mvvmfx-helloworld/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldView.java b/examples/mini-examples/helloworld/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldView.java similarity index 100% rename from examples/mvvmfx-helloworld/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldView.java rename to examples/mini-examples/helloworld/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldView.java diff --git a/examples/mvvmfx-helloworld/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldViewModel.java b/examples/mini-examples/helloworld/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldViewModel.java similarity index 100% rename from examples/mvvmfx-helloworld/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldViewModel.java rename to examples/mini-examples/helloworld/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldViewModel.java diff --git a/examples/mvvmfx-helloworld/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/Starter.java b/examples/mini-examples/helloworld/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/Starter.java similarity index 100% rename from examples/mvvmfx-helloworld/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/Starter.java rename to examples/mini-examples/helloworld/src/main/java/de/saxsys/jfx/mvvmfx/helloworld/Starter.java diff --git a/examples/mvvmfx-helloworld/src/main/resources/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldView.fxml b/examples/mini-examples/helloworld/src/main/resources/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldView.fxml similarity index 100% rename from examples/mvvmfx-helloworld/src/main/resources/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldView.fxml rename to examples/mini-examples/helloworld/src/main/resources/de/saxsys/jfx/mvvmfx/helloworld/HelloWorldView.fxml diff --git a/examples/mini-examples/pom.xml b/examples/mini-examples/pom.xml new file mode 100644 index 000000000..e2c48373b --- /dev/null +++ b/examples/mini-examples/pom.xml @@ -0,0 +1,25 @@ + + + + examples + de.saxsys.mvvmfx + 1.4.0-SNAPSHOT + + 4.0.0 + pom + mini-examples + + mvvmfx - mini-examples + + + + synchronizefx-example + fx-root-example + helloworld + helloworld-without-fxml + + + + \ No newline at end of file diff --git a/examples/mvvmfx-synchronizefx/README.md b/examples/mini-examples/synchronizefx-example/README.md similarity index 100% rename from examples/mvvmfx-synchronizefx/README.md rename to examples/mini-examples/synchronizefx-example/README.md diff --git a/examples/mvvmfx-synchronizefx/pom.xml b/examples/mini-examples/synchronizefx-example/pom.xml similarity index 74% rename from examples/mvvmfx-synchronizefx/pom.xml rename to examples/mini-examples/synchronizefx-example/pom.xml index e470f4118..af9629031 100644 --- a/examples/mvvmfx-synchronizefx/pom.xml +++ b/examples/mini-examples/synchronizefx-example/pom.xml @@ -1,13 +1,17 @@ - + - 4.0.0 - mvvmfx-synchronizefx - SynchronizeFX example + mini-examples de.saxsys.mvvmfx - examples 1.4.0-SNAPSHOT + 4.0.0 + + mvvmfx - synchronizeFX example + synchronizefx-example + UTF-8 1.8 @@ -33,4 +37,5 @@ - + + \ No newline at end of file diff --git a/examples/mvvmfx-synchronizefx/src/main/java/de/saxsys/mvvmfx/examples/synchronize/ClientApp.java b/examples/mini-examples/synchronizefx-example/src/main/java/de/saxsys/mvvmfx/examples/synchronize/ClientApp.java similarity index 100% rename from examples/mvvmfx-synchronizefx/src/main/java/de/saxsys/mvvmfx/examples/synchronize/ClientApp.java rename to examples/mini-examples/synchronizefx-example/src/main/java/de/saxsys/mvvmfx/examples/synchronize/ClientApp.java diff --git a/examples/mvvmfx-synchronizefx/src/main/java/de/saxsys/mvvmfx/examples/synchronize/ServerApp.java b/examples/mini-examples/synchronizefx-example/src/main/java/de/saxsys/mvvmfx/examples/synchronize/ServerApp.java similarity index 100% rename from examples/mvvmfx-synchronizefx/src/main/java/de/saxsys/mvvmfx/examples/synchronize/ServerApp.java rename to examples/mini-examples/synchronizefx-example/src/main/java/de/saxsys/mvvmfx/examples/synchronize/ServerApp.java diff --git a/examples/mvvmfx-synchronizefx/src/main/java/de/saxsys/mvvmfx/examples/synchronize/SliderView.java b/examples/mini-examples/synchronizefx-example/src/main/java/de/saxsys/mvvmfx/examples/synchronize/SliderView.java similarity index 99% rename from examples/mvvmfx-synchronizefx/src/main/java/de/saxsys/mvvmfx/examples/synchronize/SliderView.java rename to examples/mini-examples/synchronizefx-example/src/main/java/de/saxsys/mvvmfx/examples/synchronize/SliderView.java index 728e2e0c3..069353d6d 100644 --- a/examples/mvvmfx-synchronizefx/src/main/java/de/saxsys/mvvmfx/examples/synchronize/SliderView.java +++ b/examples/mini-examples/synchronizefx-example/src/main/java/de/saxsys/mvvmfx/examples/synchronize/SliderView.java @@ -3,6 +3,7 @@ import javafx.fxml.FXML; import javafx.scene.control.Label; import javafx.scene.control.Slider; + import de.saxsys.mvvmfx.FxmlView; import de.saxsys.mvvmfx.InjectViewModel; diff --git a/examples/mvvmfx-synchronizefx/src/main/java/de/saxsys/mvvmfx/examples/synchronize/SliderViewModel.java b/examples/mini-examples/synchronizefx-example/src/main/java/de/saxsys/mvvmfx/examples/synchronize/SliderViewModel.java similarity index 99% rename from examples/mvvmfx-synchronizefx/src/main/java/de/saxsys/mvvmfx/examples/synchronize/SliderViewModel.java rename to examples/mini-examples/synchronizefx-example/src/main/java/de/saxsys/mvvmfx/examples/synchronize/SliderViewModel.java index 5e45eb7cb..676cb3bd4 100644 --- a/examples/mvvmfx-synchronizefx/src/main/java/de/saxsys/mvvmfx/examples/synchronize/SliderViewModel.java +++ b/examples/mini-examples/synchronizefx-example/src/main/java/de/saxsys/mvvmfx/examples/synchronize/SliderViewModel.java @@ -1,12 +1,13 @@ package de.saxsys.mvvmfx.examples.synchronize; -import de.saxsys.mvvmfx.ViewModel; import javafx.beans.binding.Bindings; import javafx.beans.property.DoubleProperty; import javafx.beans.property.ReadOnlyStringProperty; import javafx.beans.property.ReadOnlyStringWrapper; import javafx.beans.property.SimpleDoubleProperty; +import de.saxsys.mvvmfx.ViewModel; + public class SliderViewModel implements ViewModel { private final DoubleProperty sliderValue = new SimpleDoubleProperty(); diff --git a/examples/mvvmfx-synchronizefx/src/main/resources/de/saxsys/mvvmfx/examples/synchronize/SliderView.fxml b/examples/mini-examples/synchronizefx-example/src/main/resources/de/saxsys/mvvmfx/examples/synchronize/SliderView.fxml similarity index 100% rename from examples/mvvmfx-synchronizefx/src/main/resources/de/saxsys/mvvmfx/examples/synchronize/SliderView.fxml rename to examples/mini-examples/synchronizefx-example/src/main/resources/de/saxsys/mvvmfx/examples/synchronize/SliderView.fxml diff --git a/examples/pom.xml b/examples/pom.xml index c89f33836..a0a2f0b21 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -17,18 +17,20 @@ mvvmfx-complex-example mvvmfx-guice-starter mvvmfx-cdi-starter - mvvmfx-fx-root-example - mvvmfx-helloworld - mvvmfx-helloworld-without-fxml - mvvmfx-synchronizefx contacts-example books-example todomvc-example + mini-examples + + de.saxsys.mvvmfx + mini-examples + ${project.version} + de.saxsys.mvvmfx mvvmfx-complex @@ -46,22 +48,22 @@ de.saxsys.mvvmfx - mvvmfx-fx-root-example + fx-root-example ${project.version} de.saxsys.mvvmfx - mvvmfx-helloworld + helloworld ${project.version} de.saxsys.mvvmfx - mvvmfx-helloworld-without-fxml + helloworld-without-fxml ${project.version} de.saxsys.mvvmfx - mvvmfx-synchronizefx + synchronizefx-example ${project.version} From c8deace5881bf239bd222265d8281c4eb407cf77 Mon Sep 17 00:00:00 2001 From: Manuel Mauky Date: Thu, 2 Jul 2015 15:24:55 +0200 Subject: [PATCH 12/33] #271 combined cdi,guice and complex example into one --- examples/mini-examples/pom.xml | 1 + .../mini-examples/welcome-example/README.md | 18 ++++ .../welcome-example}/pom.xml | 94 ++++++++----------- .../main/java/de/saxsys/jfx/CdiStarter.java} | 2 +- .../java/de/saxsys/jfx/GuiceStarter.java} | 2 +- .../jfx/exampleapplication/model/Gender.java | 0 .../jfx/exampleapplication/model/Person.java | 6 +- .../exampleapplication/model/Repository.java | 3 +- .../view/maincontainer/MainContainerView.java | 26 ++--- .../view/personlogin/PersonLoginView.java | 1 + .../view/personwelcome/PersonWelcomeView.java | 14 +-- .../maincontainer/MainContainerViewModel.java | 1 + .../personlogin/PersonLoginViewModel.java | 4 +- .../PersonLoginViewModelNotifications.java | 0 .../personwelcome/PersonWelcomeViewModel.java | 0 .../src/main/resources/META-INF/beans.xml | 6 +- .../view/maincontainer/MainContainerView.fxml | 0 .../view/personlogin/PersonLoginView.fxml | 0 .../view/personwelcome/PersonWelcomeView.fxml | 0 .../personlogin/PersonLoginViewModelTest.java | 0 .../PersonWelcomeViewModelTest.java | 0 examples/mvvmfx-cdi-starter/README.md | 10 -- examples/mvvmfx-cdi-starter/pom.xml | 55 ----------- .../src/main/resources/META-INF/beans.xml | 22 ----- examples/mvvmfx-complex-example/README.md | 41 -------- examples/mvvmfx-complex-example/pom.xml | 77 --------------- examples/mvvmfx-guice-starter/README.md | 10 -- examples/pom.xml | 23 +---- 28 files changed, 97 insertions(+), 319 deletions(-) create mode 100644 examples/mini-examples/welcome-example/README.md rename examples/{mvvmfx-guice-starter => mini-examples/welcome-example}/pom.xml (50%) rename examples/{mvvmfx-cdi-starter/src/main/java/de/saxsys/jfx/Starter.java => mini-examples/welcome-example/src/main/java/de/saxsys/jfx/CdiStarter.java} (93%) rename examples/{mvvmfx-guice-starter/src/main/java/de/saxsys/jfx/Starter.java => mini-examples/welcome-example/src/main/java/de/saxsys/jfx/GuiceStarter.java} (93%) rename examples/{mvvmfx-complex-example => mini-examples/welcome-example}/src/main/java/de/saxsys/jfx/exampleapplication/model/Gender.java (100%) rename examples/{mvvmfx-complex-example => mini-examples/welcome-example}/src/main/java/de/saxsys/jfx/exampleapplication/model/Person.java (96%) rename examples/{mvvmfx-complex-example => mini-examples/welcome-example}/src/main/java/de/saxsys/jfx/exampleapplication/model/Repository.java (99%) rename examples/{mvvmfx-complex-example => mini-examples/welcome-example}/src/main/java/de/saxsys/jfx/exampleapplication/view/maincontainer/MainContainerView.java (99%) rename examples/{mvvmfx-complex-example => mini-examples/welcome-example}/src/main/java/de/saxsys/jfx/exampleapplication/view/personlogin/PersonLoginView.java (99%) rename examples/{mvvmfx-complex-example => mini-examples/welcome-example}/src/main/java/de/saxsys/jfx/exampleapplication/view/personwelcome/PersonWelcomeView.java (99%) rename examples/{mvvmfx-complex-example => mini-examples/welcome-example}/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/maincontainer/MainContainerViewModel.java (99%) rename examples/{mvvmfx-complex-example => mini-examples/welcome-example}/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personlogin/PersonLoginViewModel.java (97%) rename examples/{mvvmfx-complex-example => mini-examples/welcome-example}/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personlogin/PersonLoginViewModelNotifications.java (100%) rename examples/{mvvmfx-complex-example => mini-examples/welcome-example}/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personwelcome/PersonWelcomeViewModel.java (100%) rename examples/{mvvmfx-complex-example => mini-examples/welcome-example}/src/main/resources/META-INF/beans.xml (82%) rename examples/{mvvmfx-complex-example => mini-examples/welcome-example}/src/main/resources/de/saxsys/jfx/exampleapplication/view/maincontainer/MainContainerView.fxml (100%) rename examples/{mvvmfx-complex-example => mini-examples/welcome-example}/src/main/resources/de/saxsys/jfx/exampleapplication/view/personlogin/PersonLoginView.fxml (100%) rename examples/{mvvmfx-complex-example => mini-examples/welcome-example}/src/main/resources/de/saxsys/jfx/exampleapplication/view/personwelcome/PersonWelcomeView.fxml (100%) rename examples/{mvvmfx-complex-example => mini-examples/welcome-example}/src/test/java/de/saxsys/jfx/viewmodel/personlogin/PersonLoginViewModelTest.java (100%) rename examples/{mvvmfx-complex-example => mini-examples/welcome-example}/src/test/java/de/saxsys/jfx/viewmodel/personwelcome/PersonWelcomeViewModelTest.java (100%) delete mode 100644 examples/mvvmfx-cdi-starter/README.md delete mode 100644 examples/mvvmfx-cdi-starter/pom.xml delete mode 100644 examples/mvvmfx-cdi-starter/src/main/resources/META-INF/beans.xml delete mode 100644 examples/mvvmfx-complex-example/README.md delete mode 100644 examples/mvvmfx-complex-example/pom.xml delete mode 100644 examples/mvvmfx-guice-starter/README.md diff --git a/examples/mini-examples/pom.xml b/examples/mini-examples/pom.xml index e2c48373b..1f910d633 100644 --- a/examples/mini-examples/pom.xml +++ b/examples/mini-examples/pom.xml @@ -19,6 +19,7 @@ fx-root-example helloworld helloworld-without-fxml + welcome-example diff --git a/examples/mini-examples/welcome-example/README.md b/examples/mini-examples/welcome-example/README.md new file mode 100644 index 000000000..1072ebe5a --- /dev/null +++ b/examples/mini-examples/welcome-example/README.md @@ -0,0 +1,18 @@ +mvvmfx welcome example +====================== + +This example is slightly more complex example then the other mini-examples. +It shows a login dialog where users get a welcome message after they where logged in. + +The example shows many interesting parts of the mvvmFX framework: + +## Dependency-Injection + +The code in the application uses the `@Inject` annotation and there are App classes for both **CDI/Weld** and **Guice**. +It demonstrates that it's possible to use the same code base for both dependency injection frameworks while only using +different starter classes for each framework. + +## Commands + +The example uses our [Commands](https://github.com/sialcasa/mvvmFX/wiki/Commands) feature for handling of actions. + diff --git a/examples/mvvmfx-guice-starter/pom.xml b/examples/mini-examples/welcome-example/pom.xml similarity index 50% rename from examples/mvvmfx-guice-starter/pom.xml rename to examples/mini-examples/welcome-example/pom.xml index 91d60ab2d..bc0360a0b 100644 --- a/examples/mvvmfx-guice-starter/pom.xml +++ b/examples/mini-examples/welcome-example/pom.xml @@ -1,92 +1,72 @@ - + - 4.0.0 - mvvmfx-guice-example - Guice Start Example - - - This example shows the usage of the mvvmFX framework with Guice Dependency Injection. - - - + mini-examples de.saxsys.mvvmfx - examples 1.4.0-SNAPSHOT - - UTF-8 - 1.8 - 1.8 - + 4.0.0 - - - oss-sonatype - oss-sonatype - https://oss.sonatype.org/content/repositories/snapshots/ - - true - - - + mvvmfx - welcome screen example + welcome-example - junit - junit - test + de.saxsys + mvvmfx + - commons-lang - commons-lang - 2.6 + javax.inject + javax.inject + 1 + + + de.saxsys - mvvmfx + mvvmfx-cdi + + org.jboss + jandex + 1.2.4.Final + + + de.saxsys mvvmfx-guice + + - de.saxsys.mvvmfx - mvvmfx-complex + junit + junit + test - org.slf4j - slf4j-simple + commons-lang + commons-lang + 2.6 com.google.guava guava 12.0 - - javax.inject - javax.inject - 1 - org.mockito mockito-all test + + org.slf4j + slf4j-simple + - - src/main/java - - - maven-assembly-plugin - - - jar-with-dependencies - - - - - - - + \ No newline at end of file diff --git a/examples/mvvmfx-cdi-starter/src/main/java/de/saxsys/jfx/Starter.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/CdiStarter.java similarity index 93% rename from examples/mvvmfx-cdi-starter/src/main/java/de/saxsys/jfx/Starter.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/CdiStarter.java index f324cff58..bd1e0c3f3 100644 --- a/examples/mvvmfx-cdi-starter/src/main/java/de/saxsys/jfx/Starter.java +++ b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/CdiStarter.java @@ -15,7 +15,7 @@ * * @author manuel.mauky */ -public class Starter extends MvvmfxCdiApplication { +public class CdiStarter extends MvvmfxCdiApplication { public static void main(String... args) { launch(args); diff --git a/examples/mvvmfx-guice-starter/src/main/java/de/saxsys/jfx/Starter.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/GuiceStarter.java similarity index 93% rename from examples/mvvmfx-guice-starter/src/main/java/de/saxsys/jfx/Starter.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/GuiceStarter.java index db610338f..26ed021a4 100644 --- a/examples/mvvmfx-guice-starter/src/main/java/de/saxsys/jfx/Starter.java +++ b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/GuiceStarter.java @@ -15,7 +15,7 @@ * * @author sialcasa */ -public class Starter extends MvvmfxGuiceApplication { +public class GuiceStarter extends MvvmfxGuiceApplication { public static void main(final String[] args) { launch(args); diff --git a/examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Gender.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Gender.java similarity index 100% rename from examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Gender.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Gender.java diff --git a/examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Person.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Person.java similarity index 96% rename from examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Person.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Person.java index 17aa8a067..7185b9250 100644 --- a/examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Person.java +++ b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Person.java @@ -1,12 +1,12 @@ package de.saxsys.jfx.exampleapplication.model; +import java.util.Random; + import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; -import java.util.Random; - /** * The class represents a Person with a firstname and a lastname. It provides access with JavaFX Properties. * @@ -52,7 +52,7 @@ public StringProperty lastNameProperty() { /** - * @return the gender of the person as {@link javafx.beans.property.ObjectProperty}. + * @return the gender of the person as {@link ObjectProperty}. */ public ObjectProperty genderProperty() { return gender; diff --git a/examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Repository.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Repository.java similarity index 99% rename from examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Repository.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Repository.java index 95749117b..10e4c3199 100644 --- a/examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Repository.java +++ b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Repository.java @@ -1,9 +1,10 @@ package de.saxsys.jfx.exampleapplication.model; -import javax.inject.Singleton; import java.util.ArrayList; import java.util.List; +import javax.inject.Singleton; + /** * Service class for providing some dummy data. diff --git a/examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/view/maincontainer/MainContainerView.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/view/maincontainer/MainContainerView.java similarity index 99% rename from examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/view/maincontainer/MainContainerView.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/view/maincontainer/MainContainerView.java index 948e70dce..bb12cfa47 100644 --- a/examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/view/maincontainer/MainContainerView.java +++ b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/view/maincontainer/MainContainerView.java @@ -1,5 +1,19 @@ package de.saxsys.jfx.exampleapplication.view.maincontainer; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; +import java.util.ResourceBundle; + +import javafx.beans.value.ChangeListener; +import javafx.beans.value.ObservableValue; +import javafx.fxml.FXML; +import javafx.fxml.Initializable; +import javafx.scene.control.ListView; +import javafx.scene.layout.StackPane; + +import javax.inject.Inject; + import de.saxsys.jfx.exampleapplication.view.personlogin.PersonLoginView; import de.saxsys.jfx.exampleapplication.view.personwelcome.PersonWelcomeView; import de.saxsys.jfx.exampleapplication.viewmodel.maincontainer.MainContainerViewModel; @@ -10,18 +24,6 @@ import de.saxsys.mvvmfx.ViewTuple; import de.saxsys.mvvmfx.utils.notifications.NotificationCenter; import de.saxsys.mvvmfx.utils.viewlist.ViewListCellFactory; -import javafx.beans.value.ChangeListener; -import javafx.beans.value.ObservableValue; -import javafx.fxml.FXML; -import javafx.fxml.Initializable; -import javafx.scene.control.ListView; -import javafx.scene.layout.StackPane; - -import javax.inject.Inject; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; -import java.util.ResourceBundle; /** * Main View which creates the necessary subviews, and manages them. Does not need a concrete Viewmodel, so it is typed diff --git a/examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/view/personlogin/PersonLoginView.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/view/personlogin/PersonLoginView.java similarity index 99% rename from examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/view/personlogin/PersonLoginView.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/view/personlogin/PersonLoginView.java index 31b198164..d661d2ea6 100644 --- a/examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/view/personlogin/PersonLoginView.java +++ b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/view/personlogin/PersonLoginView.java @@ -12,6 +12,7 @@ import javafx.scene.control.Button; import javafx.scene.control.ChoiceBox; import javafx.scene.control.ProgressIndicator; + import de.saxsys.jfx.exampleapplication.viewmodel.personlogin.PersonLoginViewModel; import de.saxsys.jfx.exampleapplication.viewmodel.personlogin.PersonLoginViewModelNotifications; import de.saxsys.mvvmfx.FxmlView; diff --git a/examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/view/personwelcome/PersonWelcomeView.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/view/personwelcome/PersonWelcomeView.java similarity index 99% rename from examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/view/personwelcome/PersonWelcomeView.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/view/personwelcome/PersonWelcomeView.java index aae528f11..cca11d62f 100644 --- a/examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/view/personwelcome/PersonWelcomeView.java +++ b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/view/personwelcome/PersonWelcomeView.java @@ -1,17 +1,19 @@ package de.saxsys.jfx.exampleapplication.view.personwelcome; -import de.saxsys.jfx.exampleapplication.viewmodel.personwelcome.PersonWelcomeViewModel; -import de.saxsys.mvvmfx.FxmlView; -import de.saxsys.mvvmfx.InjectViewModel; -import de.saxsys.mvvmfx.utils.notifications.NotificationCenter; +import java.net.URL; +import java.util.ResourceBundle; + import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.control.Label; import javax.inject.Inject; -import java.net.URL; -import java.util.ResourceBundle; + +import de.saxsys.jfx.exampleapplication.viewmodel.personwelcome.PersonWelcomeViewModel; +import de.saxsys.mvvmfx.FxmlView; +import de.saxsys.mvvmfx.InjectViewModel; +import de.saxsys.mvvmfx.utils.notifications.NotificationCenter; /** * Code behind the fxml for visualization of the PersonWelcomeViewModel. The view binds to the property of the diff --git a/examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/maincontainer/MainContainerViewModel.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/maincontainer/MainContainerViewModel.java similarity index 99% rename from examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/maincontainer/MainContainerViewModel.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/maincontainer/MainContainerViewModel.java index 64d65f91b..3ae4f4afa 100644 --- a/examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/maincontainer/MainContainerViewModel.java +++ b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/maincontainer/MainContainerViewModel.java @@ -3,6 +3,7 @@ import javafx.beans.property.ListProperty; import javafx.beans.property.SimpleListProperty; import javafx.collections.FXCollections; + import de.saxsys.mvvmfx.ViewModel; public class MainContainerViewModel implements ViewModel { diff --git a/examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personlogin/PersonLoginViewModel.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personlogin/PersonLoginViewModel.java similarity index 97% rename from examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personlogin/PersonLoginViewModel.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personlogin/PersonLoginViewModel.java index cf08bbcee..c394a8984 100644 --- a/examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personlogin/PersonLoginViewModel.java +++ b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personlogin/PersonLoginViewModel.java @@ -1,6 +1,5 @@ package de.saxsys.jfx.exampleapplication.viewmodel.personlogin; -import de.saxsys.mvvmfx.utils.commands.Action; import javafx.application.Platform; import javafx.beans.binding.BooleanBinding; import javafx.beans.property.ReadOnlyIntegerProperty; @@ -12,6 +11,7 @@ import de.saxsys.jfx.exampleapplication.model.Person; import de.saxsys.jfx.exampleapplication.model.Repository; import de.saxsys.mvvmfx.ViewModel; +import de.saxsys.mvvmfx.utils.commands.Action; import de.saxsys.mvvmfx.utils.commands.Command; import de.saxsys.mvvmfx.utils.commands.DelegateCommand; import de.saxsys.mvvmfx.utils.itemlist.SelectableItemList; @@ -74,7 +74,7 @@ public ReadOnlyIntegerProperty loggedInPersonIdProperty() { public Command getLoginCommand() { if (loginCommand == null) { - loginCommand = new DelegateCommand(()-> new Action() { + loginCommand = new DelegateCommand(() -> new Action() { @Override protected void action() throws Exception { performLogin(); diff --git a/examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personlogin/PersonLoginViewModelNotifications.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personlogin/PersonLoginViewModelNotifications.java similarity index 100% rename from examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personlogin/PersonLoginViewModelNotifications.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personlogin/PersonLoginViewModelNotifications.java diff --git a/examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personwelcome/PersonWelcomeViewModel.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personwelcome/PersonWelcomeViewModel.java similarity index 100% rename from examples/mvvmfx-complex-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personwelcome/PersonWelcomeViewModel.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personwelcome/PersonWelcomeViewModel.java diff --git a/examples/mvvmfx-complex-example/src/main/resources/META-INF/beans.xml b/examples/mini-examples/welcome-example/src/main/resources/META-INF/beans.xml similarity index 82% rename from examples/mvvmfx-complex-example/src/main/resources/META-INF/beans.xml rename to examples/mini-examples/welcome-example/src/main/resources/META-INF/beans.xml index 8546542ac..56e256415 100644 --- a/examples/mvvmfx-complex-example/src/main/resources/META-INF/beans.xml +++ b/examples/mini-examples/welcome-example/src/main/resources/META-INF/beans.xml @@ -15,8 +15,8 @@ limitations under the License. --> + bean-discovery-mode="all"> \ No newline at end of file diff --git a/examples/mvvmfx-complex-example/src/main/resources/de/saxsys/jfx/exampleapplication/view/maincontainer/MainContainerView.fxml b/examples/mini-examples/welcome-example/src/main/resources/de/saxsys/jfx/exampleapplication/view/maincontainer/MainContainerView.fxml similarity index 100% rename from examples/mvvmfx-complex-example/src/main/resources/de/saxsys/jfx/exampleapplication/view/maincontainer/MainContainerView.fxml rename to examples/mini-examples/welcome-example/src/main/resources/de/saxsys/jfx/exampleapplication/view/maincontainer/MainContainerView.fxml diff --git a/examples/mvvmfx-complex-example/src/main/resources/de/saxsys/jfx/exampleapplication/view/personlogin/PersonLoginView.fxml b/examples/mini-examples/welcome-example/src/main/resources/de/saxsys/jfx/exampleapplication/view/personlogin/PersonLoginView.fxml similarity index 100% rename from examples/mvvmfx-complex-example/src/main/resources/de/saxsys/jfx/exampleapplication/view/personlogin/PersonLoginView.fxml rename to examples/mini-examples/welcome-example/src/main/resources/de/saxsys/jfx/exampleapplication/view/personlogin/PersonLoginView.fxml diff --git a/examples/mvvmfx-complex-example/src/main/resources/de/saxsys/jfx/exampleapplication/view/personwelcome/PersonWelcomeView.fxml b/examples/mini-examples/welcome-example/src/main/resources/de/saxsys/jfx/exampleapplication/view/personwelcome/PersonWelcomeView.fxml similarity index 100% rename from examples/mvvmfx-complex-example/src/main/resources/de/saxsys/jfx/exampleapplication/view/personwelcome/PersonWelcomeView.fxml rename to examples/mini-examples/welcome-example/src/main/resources/de/saxsys/jfx/exampleapplication/view/personwelcome/PersonWelcomeView.fxml diff --git a/examples/mvvmfx-complex-example/src/test/java/de/saxsys/jfx/viewmodel/personlogin/PersonLoginViewModelTest.java b/examples/mini-examples/welcome-example/src/test/java/de/saxsys/jfx/viewmodel/personlogin/PersonLoginViewModelTest.java similarity index 100% rename from examples/mvvmfx-complex-example/src/test/java/de/saxsys/jfx/viewmodel/personlogin/PersonLoginViewModelTest.java rename to examples/mini-examples/welcome-example/src/test/java/de/saxsys/jfx/viewmodel/personlogin/PersonLoginViewModelTest.java diff --git a/examples/mvvmfx-complex-example/src/test/java/de/saxsys/jfx/viewmodel/personwelcome/PersonWelcomeViewModelTest.java b/examples/mini-examples/welcome-example/src/test/java/de/saxsys/jfx/viewmodel/personwelcome/PersonWelcomeViewModelTest.java similarity index 100% rename from examples/mvvmfx-complex-example/src/test/java/de/saxsys/jfx/viewmodel/personwelcome/PersonWelcomeViewModelTest.java rename to examples/mini-examples/welcome-example/src/test/java/de/saxsys/jfx/viewmodel/personwelcome/PersonWelcomeViewModelTest.java diff --git a/examples/mvvmfx-cdi-starter/README.md b/examples/mvvmfx-cdi-starter/README.md deleted file mode 100644 index 382adfef7..000000000 --- a/examples/mvvmfx-cdi-starter/README.md +++ /dev/null @@ -1,10 +0,0 @@ -mvvmfx-cdi-starter -======== - -This contains the startup code to run the example application with the dependency injection framework CDI/Weld and the mvvmfx extension -[mvvmfx-cdi](/mvvmfx-parent/mvvmfx-cdi). - -The main code of the example is implemented in [mvvmfx-complex-example](/examples/mvvmfx-complex-example). - -An alternative way to run the example application is to use Guice as dependency injection framework which can be seen in the -[mvvmfx-guice-starter example](/examples/mvvmfx-guice-starter). \ No newline at end of file diff --git a/examples/mvvmfx-cdi-starter/pom.xml b/examples/mvvmfx-cdi-starter/pom.xml deleted file mode 100644 index a2e6c4aad..000000000 --- a/examples/mvvmfx-cdi-starter/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - 4.0.0 - mvvmfx-cdi-example - - mvvmFX CDI Example - - - This example shows the usage of the mvvmFX framework with CDI Dependency Injection. - - - - de.saxsys.mvvmfx - examples - 1.4.0-SNAPSHOT - - - - UTF-8 - 1.8 - 1.8 - - - - - - org.slf4j - slf4j-simple - - - - de.saxsys - mvvmfx - - - de.saxsys - mvvmfx-cdi - - - de.saxsys.mvvmfx - mvvmfx-complex - - - org.jboss - jandex - 1.2.4.Final - - - junit - junit - test - - - - diff --git a/examples/mvvmfx-cdi-starter/src/main/resources/META-INF/beans.xml b/examples/mvvmfx-cdi-starter/src/main/resources/META-INF/beans.xml deleted file mode 100644 index 8546542ac..000000000 --- a/examples/mvvmfx-cdi-starter/src/main/resources/META-INF/beans.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - \ No newline at end of file diff --git a/examples/mvvmfx-complex-example/README.md b/examples/mvvmfx-complex-example/README.md deleted file mode 100644 index d45f6d242..000000000 --- a/examples/mvvmfx-complex-example/README.md +++ /dev/null @@ -1,41 +0,0 @@ -mvvmfx complex example -====================== - -This module contains the business logic and user interface implementation of the example. -Not part of this maven module is the startup code to run the application itself. This can be done with either -[mvvmfx-cdi-starter](/examples/mvvmfx-cdi-starter) or -[mvvmfx-guice-starter](/examples/mvvmfx-guice-starter) depending on the dependency injection framework you want to use. - -This separation is possible because both guice and cdi can use the `@Inject` annotation (which is used in this module) -for dependency injection configuration. - -To see this example in action you need to: - -1. first build this module with `mvn clean install` -2. use the `Starter` class of either [mvvmfx-cdi-example](/examples/mvvmfx-cdi-starter/src/main/java/de/saxsys/jfx/Starter.java) - or [mvvmfx-guice-example](/examples/mvvmfx-guice-starter/src/main/java/de/saxsys/jfx/Starter.java). -3. If are using java 7 you need to have the `JAVA_HOME` property defined correctly because the JavaFX runtime is resolved this directory. - -##Parts of the project## - -#### de.saxsys.jfx.exampleapplication #### -Contains an application which has the following flow: - -- list of persons -- choose a person -- press login button -- see welcome sentence for chosen person - -The packages are divided into - -- Model - - __Person.java__ Bean for a Person - - __Repository.java__ Service Class for __Person.java__ -- ViewModel - - __PersonLoginViewModel.java__ creates the information which should be displayed by __PersonLoginView.java__ / __PersonLoginView.fxml__ - - __PersonWelcomeViewModel.java__ creates the information which should be displayed by __PersonWelcomeView.java__ / __PersonWelcomeView.fxml__ -- View - - __PersonLoginView.java__ and __PersonLoginView.fxml__ - - __PersonWelcomeView.java__ and __PersonWelcomeView.fxml__ - -For every __ViewModel__ is a testclass in the testpackage to give an impression how to develop testdriven. \ No newline at end of file diff --git a/examples/mvvmfx-complex-example/pom.xml b/examples/mvvmfx-complex-example/pom.xml deleted file mode 100644 index 38e938b45..000000000 --- a/examples/mvvmfx-complex-example/pom.xml +++ /dev/null @@ -1,77 +0,0 @@ - - 4.0.0 - mvvmfx-complex - Complex Example - - - de.saxsys.mvvmfx - examples - 1.4.0-SNAPSHOT - - - UTF-8 - 1.8 - 1.8 - - - - - oss-sonatype - oss-sonatype - https://oss.sonatype.org/content/repositories/snapshots/ - - true - - - - - - - javax.inject - javax.inject - 1 - - - junit - junit - test - - - commons-lang - commons-lang - 2.6 - - - de.saxsys - mvvmfx - - - com.google.guava - guava - 12.0 - - - org.mockito - mockito-all - test - - - - - src/main/java - - - maven-assembly-plugin - - - jar-with-dependencies - - - - - - - - - diff --git a/examples/mvvmfx-guice-starter/README.md b/examples/mvvmfx-guice-starter/README.md deleted file mode 100644 index a06c95108..000000000 --- a/examples/mvvmfx-guice-starter/README.md +++ /dev/null @@ -1,10 +0,0 @@ -mvvmfx-guice-starter -======== - -This contains the startup code to run the example application with the dependency injection framework Guice and the mvvmfx extension -[mvvmfx-guice](/mvvmfx-parent/mvvmfx-guice). - -The main code of the example is implemented in [mvvmfx-complex-example](/examples/mvvmfx-complex-example). - -An alternative way to run the example application is to use CDI/Weld as dependency injection framework which can be seen in the -[mvvmfx-cdi-starter example](/examples/mvvmfx-cdi-starter). \ No newline at end of file diff --git a/examples/pom.xml b/examples/pom.xml index a0a2f0b21..fcb03c9f5 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -14,9 +14,6 @@ - mvvmfx-complex-example - mvvmfx-guice-starter - mvvmfx-cdi-starter contacts-example books-example todomvc-example @@ -31,21 +28,6 @@ mini-examples ${project.version} - - de.saxsys.mvvmfx - mvvmfx-complex - ${project.version} - - - de.saxsys.mvvmfx - mvvmfx-guice-example - ${project.version} - - - de.saxsys.mvvmfx - mvvmfx-cdi-example - ${project.version} - de.saxsys.mvvmfx fx-root-example @@ -81,6 +63,11 @@ todomvc-example ${project.version} + + de.saxsys.mvvmfx + welcome-example + ${project.version} + From 97f5e272d9f6fe03f9ae479ea762219bdf1dd438 Mon Sep 17 00:00:00 2001 From: Manuel Mauky Date: Thu, 2 Jul 2015 15:35:56 +0200 Subject: [PATCH 13/33] #217 fixed package names of welcome example --- .../{jfx => mvvmfx/examples/welcome}/CdiStarter.java | 6 +++--- .../{jfx => mvvmfx/examples/welcome}/GuiceStarter.java | 6 +++--- .../examples/welcome}/model/Gender.java | 2 +- .../examples/welcome}/model/Person.java | 2 +- .../examples/welcome}/model/Repository.java | 2 +- .../welcome}/view/maincontainer/MainContainerView.java | 10 +++++----- .../welcome}/view/personlogin/PersonLoginView.java | 6 +++--- .../welcome}/view/personwelcome/PersonWelcomeView.java | 4 ++-- .../maincontainer/MainContainerViewModel.java | 2 +- .../viewmodel/personlogin/PersonLoginViewModel.java | 6 +++--- .../personlogin/PersonLoginViewModelNotifications.java | 2 +- .../personwelcome/PersonWelcomeViewModel.java | 8 ++++---- .../welcome}/view/maincontainer/MainContainerView.fxml | 2 +- .../welcome}/view/personlogin/PersonLoginView.fxml | 2 +- .../welcome}/view/personwelcome/PersonWelcomeView.fxml | 2 +- .../personlogin/PersonLoginViewModelTest.java | 6 +++--- .../personwelcome/PersonWelcomeViewModelTest.java | 10 +++++----- 17 files changed, 39 insertions(+), 39 deletions(-) rename examples/mini-examples/welcome-example/src/main/java/de/saxsys/{jfx => mvvmfx/examples/welcome}/CdiStarter.java (76%) rename examples/mini-examples/welcome-example/src/main/java/de/saxsys/{jfx => mvvmfx/examples/welcome}/GuiceStarter.java (78%) rename examples/mini-examples/welcome-example/src/main/java/de/saxsys/{jfx/exampleapplication => mvvmfx/examples/welcome}/model/Gender.java (80%) rename examples/mini-examples/welcome-example/src/main/java/de/saxsys/{jfx/exampleapplication => mvvmfx/examples/welcome}/model/Person.java (97%) rename examples/mini-examples/welcome-example/src/main/java/de/saxsys/{jfx/exampleapplication => mvvmfx/examples/welcome}/model/Repository.java (94%) rename examples/mini-examples/welcome-example/src/main/java/de/saxsys/{jfx/exampleapplication => mvvmfx/examples/welcome}/view/maincontainer/MainContainerView.java (88%) rename examples/mini-examples/welcome-example/src/main/java/de/saxsys/{jfx/exampleapplication => mvvmfx/examples/welcome}/view/personlogin/PersonLoginView.java (90%) rename examples/mini-examples/welcome-example/src/main/java/de/saxsys/{jfx/exampleapplication => mvvmfx/examples/welcome}/view/personwelcome/PersonWelcomeView.java (90%) rename examples/mini-examples/welcome-example/src/main/java/de/saxsys/{jfx/exampleapplication => mvvmfx/examples/welcome}/viewmodel/maincontainer/MainContainerViewModel.java (88%) rename examples/mini-examples/welcome-example/src/main/java/de/saxsys/{jfx/exampleapplication => mvvmfx/examples/welcome}/viewmodel/personlogin/PersonLoginViewModel.java (93%) rename examples/mini-examples/welcome-example/src/main/java/de/saxsys/{jfx/exampleapplication => mvvmfx/examples/welcome}/viewmodel/personlogin/PersonLoginViewModelNotifications.java (82%) rename examples/mini-examples/welcome-example/src/main/java/de/saxsys/{jfx/exampleapplication => mvvmfx/examples/welcome}/viewmodel/personwelcome/PersonWelcomeViewModel.java (88%) rename examples/mini-examples/welcome-example/src/main/resources/de/saxsys/{jfx/exampleapplication => mvvmfx/examples/welcome}/view/maincontainer/MainContainerView.fxml (90%) rename examples/mini-examples/welcome-example/src/main/resources/de/saxsys/{jfx/exampleapplication => mvvmfx/examples/welcome}/view/personlogin/PersonLoginView.fxml (92%) rename examples/mini-examples/welcome-example/src/main/resources/de/saxsys/{jfx/exampleapplication => mvvmfx/examples/welcome}/view/personwelcome/PersonWelcomeView.fxml (88%) rename examples/mini-examples/welcome-example/src/test/java/de/saxsys/{jfx => mvvmfx}/viewmodel/personlogin/PersonLoginViewModelTest.java (73%) rename examples/mini-examples/welcome-example/src/test/java/de/saxsys/{jfx => mvvmfx}/viewmodel/personwelcome/PersonWelcomeViewModelTest.java (87%) diff --git a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/CdiStarter.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/CdiStarter.java similarity index 76% rename from examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/CdiStarter.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/CdiStarter.java index bd1e0c3f3..1b71344d1 100644 --- a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/CdiStarter.java +++ b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/CdiStarter.java @@ -1,11 +1,11 @@ -package de.saxsys.jfx; +package de.saxsys.mvvmfx.examples.welcome; import javafx.scene.Parent; import javafx.scene.Scene; import javafx.stage.Stage; -import de.saxsys.jfx.exampleapplication.view.maincontainer.MainContainerView; -import de.saxsys.jfx.exampleapplication.viewmodel.maincontainer.MainContainerViewModel; +import de.saxsys.mvvmfx.examples.welcome.view.maincontainer.MainContainerView; +import de.saxsys.mvvmfx.examples.welcome.viewmodel.maincontainer.MainContainerViewModel; import de.saxsys.mvvmfx.cdi.MvvmfxCdiApplication; import de.saxsys.mvvmfx.FluentViewLoader; import de.saxsys.mvvmfx.ViewTuple; diff --git a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/GuiceStarter.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/GuiceStarter.java similarity index 78% rename from examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/GuiceStarter.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/GuiceStarter.java index 26ed021a4..932f620c2 100644 --- a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/GuiceStarter.java +++ b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/GuiceStarter.java @@ -1,11 +1,11 @@ -package de.saxsys.jfx; +package de.saxsys.mvvmfx.examples.welcome; import javafx.scene.Parent; import javafx.scene.Scene; import javafx.stage.Stage; -import de.saxsys.jfx.exampleapplication.view.maincontainer.MainContainerView; -import de.saxsys.jfx.exampleapplication.viewmodel.maincontainer.MainContainerViewModel; +import de.saxsys.mvvmfx.examples.welcome.view.maincontainer.MainContainerView; +import de.saxsys.mvvmfx.examples.welcome.viewmodel.maincontainer.MainContainerViewModel; import de.saxsys.mvvmfx.FluentViewLoader; import de.saxsys.mvvmfx.ViewTuple; import de.saxsys.mvvmfx.guice.MvvmfxGuiceApplication; diff --git a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Gender.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/model/Gender.java similarity index 80% rename from examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Gender.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/model/Gender.java index ec9a0c89d..64128bda7 100644 --- a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Gender.java +++ b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/model/Gender.java @@ -1,4 +1,4 @@ -package de.saxsys.jfx.exampleapplication.model; +package de.saxsys.mvvmfx.examples.welcome.model; /** * Enum of possible gender information. If a person doesn't like to provide a gender, the value {@link #NOT_SPECIFIED} diff --git a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Person.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/model/Person.java similarity index 97% rename from examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Person.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/model/Person.java index 7185b9250..975ce484c 100644 --- a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Person.java +++ b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/model/Person.java @@ -1,4 +1,4 @@ -package de.saxsys.jfx.exampleapplication.model; +package de.saxsys.mvvmfx.examples.welcome.model; import java.util.Random; diff --git a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Repository.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/model/Repository.java similarity index 94% rename from examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Repository.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/model/Repository.java index 10e4c3199..0446f04a9 100644 --- a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/model/Repository.java +++ b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/model/Repository.java @@ -1,4 +1,4 @@ -package de.saxsys.jfx.exampleapplication.model; +package de.saxsys.mvvmfx.examples.welcome.model; import java.util.ArrayList; import java.util.List; diff --git a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/view/maincontainer/MainContainerView.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/view/maincontainer/MainContainerView.java similarity index 88% rename from examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/view/maincontainer/MainContainerView.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/view/maincontainer/MainContainerView.java index bb12cfa47..6a5864c03 100644 --- a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/view/maincontainer/MainContainerView.java +++ b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/view/maincontainer/MainContainerView.java @@ -1,4 +1,4 @@ -package de.saxsys.jfx.exampleapplication.view.maincontainer; +package de.saxsys.mvvmfx.examples.welcome.view.maincontainer; import java.net.URL; import java.util.HashMap; @@ -14,10 +14,10 @@ import javax.inject.Inject; -import de.saxsys.jfx.exampleapplication.view.personlogin.PersonLoginView; -import de.saxsys.jfx.exampleapplication.view.personwelcome.PersonWelcomeView; -import de.saxsys.jfx.exampleapplication.viewmodel.maincontainer.MainContainerViewModel; -import de.saxsys.jfx.exampleapplication.viewmodel.personwelcome.PersonWelcomeViewModel; +import de.saxsys.mvvmfx.examples.welcome.view.personlogin.PersonLoginView; +import de.saxsys.mvvmfx.examples.welcome.view.personwelcome.PersonWelcomeView; +import de.saxsys.mvvmfx.examples.welcome.viewmodel.maincontainer.MainContainerViewModel; +import de.saxsys.mvvmfx.examples.welcome.viewmodel.personwelcome.PersonWelcomeViewModel; import de.saxsys.mvvmfx.FluentViewLoader; import de.saxsys.mvvmfx.FxmlView; import de.saxsys.mvvmfx.InjectViewModel; diff --git a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/view/personlogin/PersonLoginView.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/view/personlogin/PersonLoginView.java similarity index 90% rename from examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/view/personlogin/PersonLoginView.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/view/personlogin/PersonLoginView.java index d661d2ea6..b957c6bd8 100644 --- a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/view/personlogin/PersonLoginView.java +++ b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/view/personlogin/PersonLoginView.java @@ -1,4 +1,4 @@ -package de.saxsys.jfx.exampleapplication.view.personlogin; +package de.saxsys.mvvmfx.examples.welcome.view.personlogin; import java.net.URL; import java.util.ResourceBundle; @@ -13,8 +13,8 @@ import javafx.scene.control.ChoiceBox; import javafx.scene.control.ProgressIndicator; -import de.saxsys.jfx.exampleapplication.viewmodel.personlogin.PersonLoginViewModel; -import de.saxsys.jfx.exampleapplication.viewmodel.personlogin.PersonLoginViewModelNotifications; +import de.saxsys.mvvmfx.examples.welcome.viewmodel.personlogin.PersonLoginViewModel; +import de.saxsys.mvvmfx.examples.welcome.viewmodel.personlogin.PersonLoginViewModelNotifications; import de.saxsys.mvvmfx.FxmlView; import de.saxsys.mvvmfx.InjectViewModel; import de.saxsys.mvvmfx.utils.commands.Command; diff --git a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/view/personwelcome/PersonWelcomeView.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/view/personwelcome/PersonWelcomeView.java similarity index 90% rename from examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/view/personwelcome/PersonWelcomeView.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/view/personwelcome/PersonWelcomeView.java index cca11d62f..a03eec26e 100644 --- a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/view/personwelcome/PersonWelcomeView.java +++ b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/view/personwelcome/PersonWelcomeView.java @@ -1,4 +1,4 @@ -package de.saxsys.jfx.exampleapplication.view.personwelcome; +package de.saxsys.mvvmfx.examples.welcome.view.personwelcome; import java.net.URL; import java.util.ResourceBundle; @@ -10,7 +10,7 @@ import javax.inject.Inject; -import de.saxsys.jfx.exampleapplication.viewmodel.personwelcome.PersonWelcomeViewModel; +import de.saxsys.mvvmfx.examples.welcome.viewmodel.personwelcome.PersonWelcomeViewModel; import de.saxsys.mvvmfx.FxmlView; import de.saxsys.mvvmfx.InjectViewModel; import de.saxsys.mvvmfx.utils.notifications.NotificationCenter; diff --git a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/maincontainer/MainContainerViewModel.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/viewmodel/maincontainer/MainContainerViewModel.java similarity index 88% rename from examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/maincontainer/MainContainerViewModel.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/viewmodel/maincontainer/MainContainerViewModel.java index 3ae4f4afa..807bfd873 100644 --- a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/maincontainer/MainContainerViewModel.java +++ b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/viewmodel/maincontainer/MainContainerViewModel.java @@ -1,4 +1,4 @@ -package de.saxsys.jfx.exampleapplication.viewmodel.maincontainer; +package de.saxsys.mvvmfx.examples.welcome.viewmodel.maincontainer; import javafx.beans.property.ListProperty; import javafx.beans.property.SimpleListProperty; diff --git a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personlogin/PersonLoginViewModel.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/viewmodel/personlogin/PersonLoginViewModel.java similarity index 93% rename from examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personlogin/PersonLoginViewModel.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/viewmodel/personlogin/PersonLoginViewModel.java index c394a8984..e9c271d8a 100644 --- a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personlogin/PersonLoginViewModel.java +++ b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/viewmodel/personlogin/PersonLoginViewModel.java @@ -1,4 +1,4 @@ -package de.saxsys.jfx.exampleapplication.viewmodel.personlogin; +package de.saxsys.mvvmfx.examples.welcome.viewmodel.personlogin; import javafx.application.Platform; import javafx.beans.binding.BooleanBinding; @@ -8,8 +8,8 @@ import javax.inject.Inject; -import de.saxsys.jfx.exampleapplication.model.Person; -import de.saxsys.jfx.exampleapplication.model.Repository; +import de.saxsys.mvvmfx.examples.welcome.model.Person; +import de.saxsys.mvvmfx.examples.welcome.model.Repository; import de.saxsys.mvvmfx.ViewModel; import de.saxsys.mvvmfx.utils.commands.Action; import de.saxsys.mvvmfx.utils.commands.Command; diff --git a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personlogin/PersonLoginViewModelNotifications.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/viewmodel/personlogin/PersonLoginViewModelNotifications.java similarity index 82% rename from examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personlogin/PersonLoginViewModelNotifications.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/viewmodel/personlogin/PersonLoginViewModelNotifications.java index da892f95f..e04b5b83f 100644 --- a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personlogin/PersonLoginViewModelNotifications.java +++ b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/viewmodel/personlogin/PersonLoginViewModelNotifications.java @@ -1,4 +1,4 @@ -package de.saxsys.jfx.exampleapplication.viewmodel.personlogin; +package de.saxsys.mvvmfx.examples.welcome.viewmodel.personlogin; public enum PersonLoginViewModelNotifications { OK("Das Einloggen war erfolgreich"); diff --git a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personwelcome/PersonWelcomeViewModel.java b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/viewmodel/personwelcome/PersonWelcomeViewModel.java similarity index 88% rename from examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personwelcome/PersonWelcomeViewModel.java rename to examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/viewmodel/personwelcome/PersonWelcomeViewModel.java index a57f12bb2..08323be1b 100644 --- a/examples/mini-examples/welcome-example/src/main/java/de/saxsys/jfx/exampleapplication/viewmodel/personwelcome/PersonWelcomeViewModel.java +++ b/examples/mini-examples/welcome-example/src/main/java/de/saxsys/mvvmfx/examples/welcome/viewmodel/personwelcome/PersonWelcomeViewModel.java @@ -1,4 +1,4 @@ -package de.saxsys.jfx.exampleapplication.viewmodel.personwelcome; +package de.saxsys.mvvmfx.examples.welcome.viewmodel.personwelcome; import javafx.beans.binding.Bindings; import javafx.beans.binding.StringBinding; @@ -7,9 +7,9 @@ import javax.inject.Inject; -import de.saxsys.jfx.exampleapplication.model.Gender; -import de.saxsys.jfx.exampleapplication.model.Person; -import de.saxsys.jfx.exampleapplication.model.Repository; +import de.saxsys.mvvmfx.examples.welcome.model.Gender; +import de.saxsys.mvvmfx.examples.welcome.model.Person; +import de.saxsys.mvvmfx.examples.welcome.model.Repository; import de.saxsys.mvvmfx.ViewModel; /** diff --git a/examples/mini-examples/welcome-example/src/main/resources/de/saxsys/jfx/exampleapplication/view/maincontainer/MainContainerView.fxml b/examples/mini-examples/welcome-example/src/main/resources/de/saxsys/mvvmfx/examples/welcome/view/maincontainer/MainContainerView.fxml similarity index 90% rename from examples/mini-examples/welcome-example/src/main/resources/de/saxsys/jfx/exampleapplication/view/maincontainer/MainContainerView.fxml rename to examples/mini-examples/welcome-example/src/main/resources/de/saxsys/mvvmfx/examples/welcome/view/maincontainer/MainContainerView.fxml index a08acb15a..7a4f88b07 100644 --- a/examples/mini-examples/welcome-example/src/main/resources/de/saxsys/jfx/exampleapplication/view/maincontainer/MainContainerView.fxml +++ b/examples/mini-examples/welcome-example/src/main/resources/de/saxsys/mvvmfx/examples/welcome/view/maincontainer/MainContainerView.fxml @@ -9,7 +9,7 @@ + fx:controller="de.saxsys.mvvmfx.examples.welcome.view.maincontainer.MainContainerView"> diff --git a/examples/mini-examples/welcome-example/src/main/resources/de/saxsys/jfx/exampleapplication/view/personlogin/PersonLoginView.fxml b/examples/mini-examples/welcome-example/src/main/resources/de/saxsys/mvvmfx/examples/welcome/view/personlogin/PersonLoginView.fxml similarity index 92% rename from examples/mini-examples/welcome-example/src/main/resources/de/saxsys/jfx/exampleapplication/view/personlogin/PersonLoginView.fxml rename to examples/mini-examples/welcome-example/src/main/resources/de/saxsys/mvvmfx/examples/welcome/view/personlogin/PersonLoginView.fxml index 54a9b1745..16c2a9fc9 100644 --- a/examples/mini-examples/welcome-example/src/main/resources/de/saxsys/jfx/exampleapplication/view/personlogin/PersonLoginView.fxml +++ b/examples/mini-examples/welcome-example/src/main/resources/de/saxsys/mvvmfx/examples/welcome/view/personlogin/PersonLoginView.fxml @@ -8,7 +8,7 @@ + fx:controller="de.saxsys.mvvmfx.examples.welcome.view.personlogin.PersonLoginView"> diff --git a/examples/mini-examples/welcome-example/src/main/resources/de/saxsys/jfx/exampleapplication/view/personwelcome/PersonWelcomeView.fxml b/examples/mini-examples/welcome-example/src/main/resources/de/saxsys/mvvmfx/examples/welcome/view/personwelcome/PersonWelcomeView.fxml similarity index 88% rename from examples/mini-examples/welcome-example/src/main/resources/de/saxsys/jfx/exampleapplication/view/personwelcome/PersonWelcomeView.fxml rename to examples/mini-examples/welcome-example/src/main/resources/de/saxsys/mvvmfx/examples/welcome/view/personwelcome/PersonWelcomeView.fxml index 6b16bfe8d..e294eebe8 100644 --- a/examples/mini-examples/welcome-example/src/main/resources/de/saxsys/jfx/exampleapplication/view/personwelcome/PersonWelcomeView.fxml +++ b/examples/mini-examples/welcome-example/src/main/resources/de/saxsys/mvvmfx/examples/welcome/view/personwelcome/PersonWelcomeView.fxml @@ -10,7 +10,7 @@ + fx:controller="de.saxsys.mvvmfx.examples.welcome.view.personwelcome.PersonWelcomeView">