Moved listitems to sperate package

No3x · Mar 18, 2018 · 1b7c18c · 1b7c18c
1 parent a586779
commit 1b7c18c
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 9 deletions.
diff --git a/src/main/java/hello/gui/persons/edit/PersonsEditView.java b/src/main/java/hello/gui/persons/edit/PersonsEditView.java
@@ -10,8 +10,8 @@
 import de.saxsys.mvvmfx.utils.validation.visualization.ValidationVisualizer;
 import de.saxsys.mvvmfx.utils.viewlist.CachedViewModelCellFactory;
 import de.saxsys.mvvmfx.utils.viewlist.ViewListCellFactory;
-import hello.gui.persons.view.TeamListItemView;
-import hello.gui.persons.view.TeamListItemViewModel;
+import hello.gui.persons.listitems.TeamListItemView;
+import hello.gui.persons.listitems.TeamListItemViewModel;
 import javafx.beans.binding.Bindings;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;

diff --git a/src/main/java/hello/gui/persons/edit/PersonsEditViewModel.java b/src/main/java/hello/gui/persons/edit/PersonsEditViewModel.java
@@ -21,7 +21,7 @@
 import hello.data.repository.PersonRepository;
 import hello.data.repository.PersonTeamRepository;
 import hello.data.repository.TeamRepository;
-import hello.gui.persons.view.TeamListItemViewModel;
+import hello.gui.persons.listitems.TeamListItemViewModel;
 import hello.gui.scopes.PersonDetailScope;
 import hello.gui.validators.EmptyListValidator;
 import javafx.beans.property.ObjectProperty;

diff --git a/.../gui/persons/view/PersonListItemView.java → ...persons/listitems/PersonListItemView.java b/.../gui/persons/view/PersonListItemView.java → ...persons/listitems/PersonListItemView.java
@@ -1,4 +1,4 @@
-package hello.gui.persons.view;
+package hello.gui.persons.listitems;
 
 import de.saxsys.mvvmfx.FxmlView;
 import de.saxsys.mvvmfx.InjectViewModel;

diff --git a/...persons/view/PersonListItemViewModel.java → ...ns/listitems/PersonListItemViewModel.java b/...persons/view/PersonListItemViewModel.java → ...ns/listitems/PersonListItemViewModel.java
@@ -1,4 +1,4 @@
-package hello.gui.persons.view;
+package hello.gui.persons.listitems;
 
 import de.saxsys.mvvmfx.ViewModel;
 import hello.data.model.Person;

diff --git a/...lo/gui/persons/view/TeamListItemView.java → ...i/persons/listitems/TeamListItemView.java b/...lo/gui/persons/view/TeamListItemView.java → ...i/persons/listitems/TeamListItemView.java
@@ -1,4 +1,4 @@
-package hello.gui.persons.view;
+package hello.gui.persons.listitems;
 
 import de.saxsys.mvvmfx.FxmlView;
 import de.saxsys.mvvmfx.InjectViewModel;

diff --git a/...i/persons/view/TeamListItemViewModel.java → ...sons/listitems/TeamListItemViewModel.java b/...i/persons/view/TeamListItemViewModel.java → ...sons/listitems/TeamListItemViewModel.java
@@ -1,4 +1,4 @@
-package hello.gui.persons.view;
+package hello.gui.persons.listitems;
 
 import de.saxsys.mvvmfx.ViewModel;
 import hello.data.model.Team;

diff --git a/src/main/java/hello/gui/persons/view/PersonListView.java b/src/main/java/hello/gui/persons/view/PersonListView.java
@@ -3,6 +3,10 @@
 import de.saxsys.mvvmfx.FxmlView;
 import de.saxsys.mvvmfx.InjectViewModel;
 import de.saxsys.mvvmfx.utils.viewlist.CachedViewModelCellFactory;
+import hello.gui.persons.listitems.PersonListItemView;
+import hello.gui.persons.listitems.PersonListItemViewModel;
+import hello.gui.persons.listitems.TeamListItemView;
+import hello.gui.persons.listitems.TeamListItemViewModel;
 import hello.utils.JavaFXUtils;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;

diff --git a/src/main/java/hello/gui/persons/view/PersonListViewModel.java b/src/main/java/hello/gui/persons/view/PersonListViewModel.java
@@ -12,6 +12,8 @@
 import hello.gui.WindowManager;
 import hello.gui.persons.edit.PersonsEditView;
 import hello.gui.persons.edit.PersonsEditViewModel;
+import hello.gui.persons.listitems.PersonListItemViewModel;
+import hello.gui.persons.listitems.TeamListItemViewModel;
 import hello.gui.scopes.PersonDetailScope;
 import javafx.beans.property.LongProperty;
 import javafx.collections.FXCollections;

diff --git a/.../gui/persons/view/PersonListItemView.fxml → ...persons/listitems/PersonListItemView.fxml b/.../gui/persons/view/PersonListItemView.fxml → ...persons/listitems/PersonListItemView.fxml
@@ -6,7 +6,7 @@
 
 <HBox alignment="BASELINE_LEFT" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
       spacing="6.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
-      fx:controller="hello.gui.persons.view.PersonListItemView">
+      fx:controller="hello.gui.persons.listitems.PersonListItemView">
     <children>
         <Label fx:id="titleLabel" style="-fx-font-size: 1em;" text="Title"/>
         <Label fx:id="identifierLabel" style="-fx-font-size: 0.8em;" text="Identifier"/>

diff --git a/...lo/gui/persons/view/TeamListItemView.fxml → ...i/persons/listitems/TeamListItemView.fxml b/...lo/gui/persons/view/TeamListItemView.fxml → ...i/persons/listitems/TeamListItemView.fxml
@@ -6,7 +6,7 @@
 
 <HBox alignment="BASELINE_LEFT" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
       spacing="6.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
-      fx:controller="hello.gui.persons.view.TeamListItemView">
+      fx:controller="hello.gui.persons.listitems.TeamListItemView">
     <children>
         <Label fx:id="titleLabel" style="-fx-font-size: 1em;" text="Title"/>
         <Label fx:id="identifierLabel" style="-fx-font-size: 0.8em;" text="Identifier"/>