Skip to content

Commit

Permalink
#217 renamed contacts-example module
Browse files Browse the repository at this point in the history
  • Loading branch information
manuel-mauky committed Jul 2, 2015
1 parent ba92846 commit d33762b
Show file tree
Hide file tree
Showing 94 changed files with 247 additions and 257 deletions.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<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>
Expand All @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.saxsys.mvvmfx.contacts;
package de.saxsys.mvvmfx.examples.contacts;

import java.util.Locale;
import java.util.ResourceBundle;
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
* This package contains CDI event classes.
*/
package de.saxsys.mvvmfx.contacts.events;
package de.saxsys.mvvmfx.examples.contacts.events;
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.saxsys.mvvmfx.contacts.model;
package de.saxsys.mvvmfx.examples.contacts.model;

/**
* An entity class that represents an address.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.saxsys.mvvmfx.contacts.model;
package de.saxsys.mvvmfx.examples.contacts.model;

import java.time.LocalDate;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.saxsys.mvvmfx.contacts.model;
package de.saxsys.mvvmfx.examples.contacts.model;


import javax.xml.bind.annotation.XmlAccessType;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.saxsys.mvvmfx.contacts.model;
package de.saxsys.mvvmfx.examples.contacts.model;

import java.util.UUID;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.saxsys.mvvmfx.contacts.model;
package de.saxsys.mvvmfx.examples.contacts.model;

public class Subdivision {

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.saxsys.mvvmfx.contacts.ui.about;
package de.saxsys.mvvmfx.examples.contacts.ui.about;

import java.util.function.Consumer;

Expand All @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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> {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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";
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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<ContactDialogViewModel> {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
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;
import javafx.beans.property.*;
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 {

Expand All @@ -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();
}
Expand Down Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading

0 comments on commit d33762b

Please sign in to comment.