#217 fixed package names of welcome example

sialcasa · Jul 2, 2015 · 97f5e27 · 97f5e27
1 parent c8deace
commit 97f5e27
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 39 deletions.
diff --git a/...c/main/java/de/saxsys/jfx/CdiStarter.java → ...s/mvvmfx/examples/welcome/CdiStarter.java b/...c/main/java/de/saxsys/jfx/CdiStarter.java → ...s/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/...main/java/de/saxsys/jfx/GuiceStarter.java → ...mvvmfx/examples/welcome/GuiceStarter.java b/...main/java/de/saxsys/jfx/GuiceStarter.java → ...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/.../jfx/exampleapplication/model/Gender.java → ...mvvmfx/examples/welcome/model/Gender.java b/.../jfx/exampleapplication/model/Gender.java → ...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/.../jfx/exampleapplication/model/Person.java → ...mvvmfx/examples/welcome/model/Person.java b/.../jfx/exampleapplication/model/Person.java → ...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/.../exampleapplication/model/Repository.java → ...fx/examples/welcome/model/Repository.java b/.../exampleapplication/model/Repository.java → ...fx/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/...view/maincontainer/MainContainerView.java → ...view/maincontainer/MainContainerView.java b/...view/maincontainer/MainContainerView.java → ...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/...ion/view/personlogin/PersonLoginView.java → ...ome/view/personlogin/PersonLoginView.java b/...ion/view/personlogin/PersonLoginView.java → ...ome/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/...view/personwelcome/PersonWelcomeView.java → ...view/personwelcome/PersonWelcomeView.java b/...view/personwelcome/PersonWelcomeView.java → ...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/...maincontainer/MainContainerViewModel.java → ...maincontainer/MainContainerViewModel.java b/...maincontainer/MainContainerViewModel.java → ...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/...del/personlogin/PersonLoginViewModel.java → ...del/personlogin/PersonLoginViewModel.java b/...del/personlogin/PersonLoginViewModel.java → ...del/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/...in/PersonLoginViewModelNotifications.java → ...in/PersonLoginViewModelNotifications.java b/...in/PersonLoginViewModelNotifications.java → ...in/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/...personwelcome/PersonWelcomeViewModel.java → ...personwelcome/PersonWelcomeViewModel.java b/...personwelcome/PersonWelcomeViewModel.java → ...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/...view/maincontainer/MainContainerView.fxml → ...view/maincontainer/MainContainerView.fxml b/...view/maincontainer/MainContainerView.fxml → ...view/maincontainer/MainContainerView.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.layout.VBox?>
 
 <Pane id="personInfoVbox" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8.0.40"
-	  fx:controller="de.saxsys.jfx.exampleapplication.view.maincontainer.MainContainerView">
+	  fx:controller="de.saxsys.mvvmfx.examples.welcome.view.maincontainer.MainContainerView">
 	<!-- TODO Add Nodes -->
 	<children>
 		<VBox prefHeight="-1.0" spacing="5.0">

diff --git a/...ion/view/personlogin/PersonLoginView.fxml → ...ome/view/personlogin/PersonLoginView.fxml b/...ion/view/personlogin/PersonLoginView.fxml → ...ome/view/personlogin/PersonLoginView.fxml
@@ -8,7 +8,7 @@
 
 <StackPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
 		   xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8.0.40"
-		   fx:controller="de.saxsys.jfx.exampleapplication.view.personlogin.PersonLoginView">
+		   fx:controller="de.saxsys.mvvmfx.examples.welcome.view.personlogin.PersonLoginView">
 	<!-- TODO Add Nodes -->
 	<children>
 		<VBox fx:id="layoutVbox" alignment="CENTER" minHeight="37.0" spacing="5.0">

diff --git a/...view/personwelcome/PersonWelcomeView.fxml → ...view/personwelcome/PersonWelcomeView.fxml b/...view/personwelcome/PersonWelcomeView.fxml → ...view/personwelcome/PersonWelcomeView.fxml
@@ -10,7 +10,7 @@
 <?import javafx.scene.layout.VBox?>
 
 <VBox alignment="CENTER_LEFT" spacing="10.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8.0.40"
-	  fx:controller="de.saxsys.jfx.exampleapplication.view.personwelcome.PersonWelcomeView">
+	  fx:controller="de.saxsys.mvvmfx.examples.welcome.view.personwelcome.PersonWelcomeView">
 	<children>
 		<Label fx:id="welcomeLabel" alignment="CENTER" text="The upcoming text">
 			<VBox.margin>

diff --git a/...personlogin/PersonLoginViewModelTest.java → ...personlogin/PersonLoginViewModelTest.java b/...personlogin/PersonLoginViewModelTest.java → ...personlogin/PersonLoginViewModelTest.java
@@ -1,11 +1,11 @@
-package de.saxsys.jfx.viewmodel.personlogin;
+package de.saxsys.mvvmfx.viewmodel.personlogin;
 
 import javafx.collections.ObservableList;
 
 import org.junit.Test;
 
-import de.saxsys.jfx.exampleapplication.model.Repository;
-import de.saxsys.jfx.exampleapplication.viewmodel.personlogin.PersonLoginViewModel;
+import de.saxsys.mvvmfx.examples.welcome.model.Repository;
+import de.saxsys.mvvmfx.examples.welcome.viewmodel.personlogin.PersonLoginViewModel;
 
 public class PersonLoginViewModelTest {
 

diff --git a/...onwelcome/PersonWelcomeViewModelTest.java → ...onwelcome/PersonWelcomeViewModelTest.java b/...onwelcome/PersonWelcomeViewModelTest.java → ...onwelcome/PersonWelcomeViewModelTest.java
@@ -1,14 +1,14 @@
-package de.saxsys.jfx.viewmodel.personwelcome;
+package de.saxsys.mvvmfx.viewmodel.personwelcome;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import de.saxsys.jfx.exampleapplication.model.Gender;
-import de.saxsys.jfx.exampleapplication.model.Person;
-import de.saxsys.jfx.exampleapplication.model.Repository;
-import de.saxsys.jfx.exampleapplication.viewmodel.personwelcome.PersonWelcomeViewModel;
+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.examples.welcome.viewmodel.personwelcome.PersonWelcomeViewModel;
 
 public class PersonWelcomeViewModelTest {