Merge pull request #280 from sialcasa/217_cleanup_examples

217 cleanup examples

examples/mvvmfx-books-example/pom.xml → examples/books-example/pom.xml

@@ -3,13 +3,13 @@
 		 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">
 	<parent>
-		<artifactId>mvvmfx-examples</artifactId>
-		<groupId>de.saxsys</groupId>
+		<groupId>de.saxsys.mvvmfx</groupId>
+		<artifactId>examples</artifactId>
 		<version>1.4.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>mvvmfx-library-example</artifactId>
+	<artifactId>books-example</artifactId>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/MainView.java → 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() {

examples/mvvmfx-books-example/src/main/java/de/saxsys/mvvmfx/examples/books/MainViewModel.java → examples/books-example/src/main/java/de/saxsys/mvvmfx/examples/books/MainViewModel.java

@@ -32,12 +32,12 @@ public class MainViewModel implements ViewModel {
 	private ObjectProperty<BookListItemViewModel> 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<Error> errorHandler = err -> error.set(err.getMessage());
 

examples/mvvmfx-books-example/src/main/resources/de/saxsys/mvvmfx/examples/books/style.css → 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;
+}

examples/mvvmfx-contacts/pom.xml → examples/contacts-example/pom.xml

@@ -4,11 +4,11 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>mvvmfx-examples</artifactId>
-		<groupId>de.saxsys</groupId>
+		<groupId>de.saxsys.mvvmfx</groupId>
+		<artifactId>examples</artifactId>
 		<version>1.4.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>mvvmfx-contacts</artifactId>
+	<artifactId>contacts-example</artifactId>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -23,7 +23,7 @@
 				<artifactId>javafx-maven-plugin</artifactId>
 				<version>8.1.2</version>
 				<configuration>
-					<mainClass>de.saxsys.mvvmfx.contacts.App</mainClass>
+					<mainClass>de.saxsys.mvvmfx.examples.contacts.App</mainClass>
 				</configuration>
 			</plugin>
 		</plugins>

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/App.java → 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);

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/config/ResourceProvider.java → 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;
 
 /**

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/ContactsUpdatedEvent.java → 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.

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/OpenAboutDialogEvent.java → 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.

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/OpenAddContactDialogEvent.java → 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.

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/OpenAuthorPageEvent.java → 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.

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/OpenEditContactDialogEvent.java → 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.

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/TriggerShutdownEvent.java → 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.

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/events/package-info.java → 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;
+package de.saxsys.mvvmfx.examples.contacts.events;

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Address.java → 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.

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Contact.java → 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;
 

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/ContactFactory.java → 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;

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Country.java → 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;

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/CountrySelector.java → 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;

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Identity.java → 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;
 

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/InmemoryRepository.java → 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;

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Repository.java → 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;

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/model/Subdivision.java → 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 {
 

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/about/AboutAuthorView.java → 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;

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/about/AboutAuthorViewModel.java → 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;

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/about/AboutView.java → 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<AboutViewModel> {

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/about/AboutViewModel.java → 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 {
 

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/addcontact/AddContactDialog.java → 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<AddContactDialogViewModel> {

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/addcontact/AddContactDialogViewModel.java → 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";

examples/mvvmfx-contacts/src/main/java/de/saxsys/mvvmfx/contacts/ui/addressform/AddressFormView.java → 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;