#217 fix package of todomvc app

sialcasa · Jul 2, 2015 · 7e21ae8 · 7e21ae8
1 parent 5ef3c60
commit 7e21ae8
Show file tree

Hide file tree

Showing 22 changed files with 30 additions and 38 deletions.
diff --git a/...de/saxsys/mvvmfx/example/todomvc/App.java → ...e/saxsys/mvvmfx/examples/todomvc/App.java b/...de/saxsys/mvvmfx/example/todomvc/App.java → ...e/saxsys/mvvmfx/examples/todomvc/App.java
@@ -1,12 +1,12 @@
-package de.saxsys.mvvmfx.example.todomvc;
+package de.saxsys.mvvmfx.examples.todomvc;
 
 import javafx.application.Application;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
 import de.saxsys.mvvmfx.FluentViewLoader;
-import de.saxsys.mvvmfx.example.todomvc.ui.MainView;
+import de.saxsys.mvvmfx.examples.todomvc.ui.MainView;
 
 /**
  * @author manuel.mauky

diff --git a/...vvmfx/example/todomvc/model/TodoItem.java → ...vmfx/examples/todomvc/model/TodoItem.java b/...vvmfx/example/todomvc/model/TodoItem.java → ...vmfx/examples/todomvc/model/TodoItem.java
@@ -1,4 +1,4 @@
-package de.saxsys.mvvmfx.example.todomvc.model;
+package de.saxsys.mvvmfx.examples.todomvc.model;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;

diff --git a/.../example/todomvc/model/TodoItemStore.java → ...examples/todomvc/model/TodoItemStore.java b/.../example/todomvc/model/TodoItemStore.java → ...examples/todomvc/model/TodoItemStore.java
@@ -1,4 +1,4 @@
-package de.saxsys.mvvmfx.example.todomvc.model;
+package de.saxsys.mvvmfx.examples.todomvc.model;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;

diff --git a/...vmfx/example/todomvc/ui/FilterHelper.java → ...mfx/examples/todomvc/ui/FilterHelper.java b/...vmfx/example/todomvc/ui/FilterHelper.java → ...mfx/examples/todomvc/ui/FilterHelper.java
@@ -1,4 +1,4 @@
-package de.saxsys.mvvmfx.example.todomvc.ui;
+package de.saxsys.mvvmfx.examples.todomvc.ui;
 
 import javafx.beans.InvalidationListener;
 import javafx.beans.value.ObservableBooleanValue;

diff --git a/...s/mvvmfx/example/todomvc/ui/MainView.java → .../mvvmfx/examples/todomvc/ui/MainView.java b/...s/mvvmfx/example/todomvc/ui/MainView.java → .../mvvmfx/examples/todomvc/ui/MainView.java
@@ -1,4 +1,4 @@
-package de.saxsys.mvvmfx.example.todomvc.ui;
+package de.saxsys.mvvmfx.examples.todomvc.ui;
 
 import de.saxsys.mvvmfx.FxmlView;
 

diff --git a/...mfx/example/todomvc/ui/MainViewModel.java → ...fx/examples/todomvc/ui/MainViewModel.java b/...mfx/example/todomvc/ui/MainViewModel.java → ...fx/examples/todomvc/ui/MainViewModel.java
@@ -1,4 +1,4 @@
-package de.saxsys.mvvmfx.example.todomvc.ui;
+package de.saxsys.mvvmfx.examples.todomvc.ui;
 
 import de.saxsys.mvvmfx.ViewModel;
 

diff --git a/...ple/todomvc/ui/additems/AddItemsView.java → ...les/todomvc/ui/additems/AddItemsView.java b/...ple/todomvc/ui/additems/AddItemsView.java → ...les/todomvc/ui/additems/AddItemsView.java
@@ -1,4 +1,4 @@
-package de.saxsys.mvvmfx.example.todomvc.ui.additems;
+package de.saxsys.mvvmfx.examples.todomvc.ui.additems;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;

diff --git a/...odomvc/ui/additems/AddItemsViewModel.java → ...odomvc/ui/additems/AddItemsViewModel.java b/...odomvc/ui/additems/AddItemsViewModel.java → ...odomvc/ui/additems/AddItemsViewModel.java
@@ -1,4 +1,4 @@
-package de.saxsys.mvvmfx.example.todomvc.ui.additems;
+package de.saxsys.mvvmfx.examples.todomvc.ui.additems;
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.BooleanProperty;
@@ -9,8 +9,8 @@
 import javafx.beans.property.StringProperty;
 
 import de.saxsys.mvvmfx.ViewModel;
-import de.saxsys.mvvmfx.example.todomvc.model.TodoItem;
-import de.saxsys.mvvmfx.example.todomvc.model.TodoItemStore;
+import de.saxsys.mvvmfx.examples.todomvc.model.TodoItem;
+import de.saxsys.mvvmfx.examples.todomvc.model.TodoItemStore;
 
 /**
  * @author manuel.mauky

diff --git a/...ple/todomvc/ui/controls/ControlsView.java → ...les/todomvc/ui/controls/ControlsView.java b/...ple/todomvc/ui/controls/ControlsView.java → ...les/todomvc/ui/controls/ControlsView.java
@@ -1,4 +1,4 @@
-package de.saxsys.mvvmfx.example.todomvc.ui.controls;
+package de.saxsys.mvvmfx.examples.todomvc.ui.controls;
 
 import de.saxsys.mvvmfx.FxmlView;
 import de.saxsys.mvvmfx.InjectViewModel;

diff --git a/...odomvc/ui/controls/ControlsViewModel.java → ...odomvc/ui/controls/ControlsViewModel.java b/...odomvc/ui/controls/ControlsViewModel.java → ...odomvc/ui/controls/ControlsViewModel.java
@@ -1,4 +1,4 @@
-package de.saxsys.mvvmfx.example.todomvc.ui.controls;
+package de.saxsys.mvvmfx.examples.todomvc.ui.controls;
 
 import de.saxsys.mvvmfx.MvvmFX;
 import de.saxsys.mvvmfx.utils.notifications.NotificationCenter;
@@ -10,10 +10,9 @@
 import javafx.collections.ObservableList;
 
 import de.saxsys.mvvmfx.ViewModel;
-import de.saxsys.mvvmfx.example.todomvc.model.TodoItem;
-import de.saxsys.mvvmfx.example.todomvc.model.TodoItemStore;
-import de.saxsys.mvvmfx.example.todomvc.ui.FilterHelper;
-import javafx.collections.transformation.FilteredList;
+import de.saxsys.mvvmfx.examples.todomvc.model.TodoItem;
+import de.saxsys.mvvmfx.examples.todomvc.model.TodoItemStore;
+import de.saxsys.mvvmfx.examples.todomvc.ui.FilterHelper;
 
 /**
  * @author manuel.mauky

diff --git a/...ple/todomvc/ui/item/ItemOverviewView.java → ...les/todomvc/ui/item/ItemOverviewView.java b/...ple/todomvc/ui/item/ItemOverviewView.java → ...les/todomvc/ui/item/ItemOverviewView.java
@@ -1,4 +1,4 @@
-package de.saxsys.mvvmfx.example.todomvc.ui.item;
+package de.saxsys.mvvmfx.examples.todomvc.ui.item;
 
 import de.saxsys.mvvmfx.utils.viewlist.CachedViewModelCellFactory;
 import javafx.fxml.FXML;

diff --git a/...odomvc/ui/item/ItemOverviewViewModel.java → ...odomvc/ui/item/ItemOverviewViewModel.java b/...odomvc/ui/item/ItemOverviewViewModel.java → ...odomvc/ui/item/ItemOverviewViewModel.java
@@ -1,22 +1,16 @@
-package de.saxsys.mvvmfx.example.todomvc.ui.item;
+package de.saxsys.mvvmfx.examples.todomvc.ui.item;
 
 import de.saxsys.mvvmfx.MvvmFX;
-import de.saxsys.mvvmfx.example.todomvc.ui.FilterHelper;
+import de.saxsys.mvvmfx.examples.todomvc.ui.FilterHelper;
 import de.saxsys.mvvmfx.utils.notifications.NotificationCenter;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
-import javafx.beans.value.ObservableBooleanValue;
 import javafx.collections.ObservableList;
 
 import de.saxsys.mvvmfx.ViewModel;
-import de.saxsys.mvvmfx.example.todomvc.model.TodoItem;
-import de.saxsys.mvvmfx.example.todomvc.model.TodoItemStore;
+import de.saxsys.mvvmfx.examples.todomvc.model.TodoItem;
+import de.saxsys.mvvmfx.examples.todomvc.model.TodoItemStore;
 import de.saxsys.mvvmfx.utils.itemlist.ListTransformation;
-import javafx.collections.transformation.FilteredList;
-
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.logging.Filter;
 
 /**
  * @author manuel.mauky

diff --git a/...mfx/example/todomvc/ui/item/ItemView.java → ...fx/examples/todomvc/ui/item/ItemView.java b/...mfx/example/todomvc/ui/item/ItemView.java → ...fx/examples/todomvc/ui/item/ItemView.java
@@ -1,4 +1,4 @@
-package de.saxsys.mvvmfx.example.todomvc.ui.item;
+package de.saxsys.mvvmfx.examples.todomvc.ui.item;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;

diff --git a/...xample/todomvc/ui/item/ItemViewModel.java → ...amples/todomvc/ui/item/ItemViewModel.java b/...xample/todomvc/ui/item/ItemViewModel.java → ...amples/todomvc/ui/item/ItemViewModel.java
@@ -1,15 +1,14 @@
-package de.saxsys.mvvmfx.example.todomvc.ui.item;
+package de.saxsys.mvvmfx.examples.todomvc.ui.item;
 
-import de.saxsys.mvvmfx.example.todomvc.model.TodoItemStore;
+import de.saxsys.mvvmfx.examples.todomvc.model.TodoItemStore;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ReadOnlyBooleanProperty;
-import javafx.beans.property.ReadOnlyBooleanWrapper;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
 import de.saxsys.mvvmfx.ViewModel;
-import de.saxsys.mvvmfx.example.todomvc.model.TodoItem;
+import de.saxsys.mvvmfx.examples.todomvc.model.TodoItem;
 
 /**
  * @author manuel.mauky

diff --git a/...s/mvvmfx/example/todomvc/ui/MainView.fxml → .../mvvmfx/examples/todomvc/ui/MainView.fxml b/...s/mvvmfx/example/todomvc/ui/MainView.fxml → .../mvvmfx/examples/todomvc/ui/MainView.fxml
@@ -9,7 +9,7 @@
 <?import java.net.URL?>
 <VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
 	  xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
-	  fx:controller="de.saxsys.mvvmfx.example.todomvc.ui.MainView">
+	  fx:controller="de.saxsys.mvvmfx.examples.todomvc.ui.MainView">
 	<children>
 		<Label id="title" text="todos"/>
 		<fx:include source="additems/AddItemsView.fxml"/>

diff --git a/...ple/todomvc/ui/additems/AddItemsView.fxml → ...les/todomvc/ui/additems/AddItemsView.fxml b/...ple/todomvc/ui/additems/AddItemsView.fxml → ...les/todomvc/ui/additems/AddItemsView.fxml
@@ -5,7 +5,7 @@
 <?import javafx.scene.layout.*?>
 
 <?import java.net.URL?>
-<HBox styleClass="add_item_root" fx:controller="de.saxsys.mvvmfx.example.todomvc.ui.additems.AddItemsView"
+<HBox styleClass="add_item_root" fx:controller="de.saxsys.mvvmfx.examples.todomvc.ui.additems.AddItemsView"
 	  alignment="CENTER_LEFT" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
 	<children>
 		<CheckBox fx:id="selectAll" mnemonicParsing="false"/>

diff --git a/.../example/todomvc/ui/additems/additems.css → ...examples/todomvc/ui/additems/additems.css b/.../example/todomvc/ui/additems/additems.css → ...examples/todomvc/ui/additems/additems.css
diff --git a/...ple/todomvc/ui/controls/ControlsView.fxml → ...les/todomvc/ui/controls/ControlsView.fxml b/...ple/todomvc/ui/controls/ControlsView.fxml → ...les/todomvc/ui/controls/ControlsView.fxml
@@ -5,7 +5,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<HBox fx:controller="de.saxsys.mvvmfx.example.todomvc.ui.controls.ControlsView" alignment="CENTER" spacing="20.0"
+<HBox fx:controller="de.saxsys.mvvmfx.examples.todomvc.ui.controls.ControlsView" alignment="CENTER" spacing="20.0"
 	  xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
 	<children>
 		<Label fx:id="itemsLeftLabel" text="X items left"/>

diff --git a/...ple/todomvc/ui/item/ItemOverviewView.fxml → ...les/todomvc/ui/item/ItemOverviewView.fxml b/...ple/todomvc/ui/item/ItemOverviewView.fxml → ...les/todomvc/ui/item/ItemOverviewView.fxml
@@ -6,7 +6,7 @@
 
 <AnchorPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity"
 			minWidth="-Infinity" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
-			fx:controller="de.saxsys.mvvmfx.example.todomvc.ui.item.ItemOverviewView">
+			fx:controller="de.saxsys.mvvmfx.examples.todomvc.ui.item.ItemOverviewView">
 	<children>
 		<ListView fx:id="items" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
 				  AnchorPane.topAnchor="0.0"/>

diff --git a/...mfx/example/todomvc/ui/item/ItemView.fxml → ...fx/examples/todomvc/ui/item/ItemView.fxml b/...mfx/example/todomvc/ui/item/ItemView.fxml → ...fx/examples/todomvc/ui/item/ItemView.fxml
@@ -10,7 +10,7 @@
 
 <HBox fx:id="root" alignment="CENTER_LEFT" minHeight="-Infinity" minWidth="-Infinity" styleClass="item_root"
 	  xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
-	  fx:controller="de.saxsys.mvvmfx.example.todomvc.ui.item.ItemView">
+	  fx:controller="de.saxsys.mvvmfx.examples.todomvc.ui.item.ItemView">
 	<children>
 		<CheckBox fx:id="completed" mnemonicParsing="false"/>
 		<StackPane alignment="CENTER_LEFT" HBox.hgrow="ALWAYS">

diff --git a/...vmfx/example/todomvc/ui/item/itemview.css → ...mfx/examples/todomvc/ui/item/itemview.css b/...vmfx/example/todomvc/ui/item/itemview.css → ...mfx/examples/todomvc/ui/item/itemview.css
diff --git a/...saxsys/mvvmfx/example/todomvc/ui/main.css → ...axsys/mvvmfx/examples/todomvc/ui/main.css b/...saxsys/mvvmfx/example/todomvc/ui/main.css → ...axsys/mvvmfx/examples/todomvc/ui/main.css