Minor, non-functional changes.

Author: Nicolai Parlog

demo/org/codefx/libfx/nesting/NestingDemo.java

@@ -5,7 +5,6 @@
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleObjectProperty;
 
-import org.codefx.libfx.nesting.Nestings;
 import org.codefx.libfx.nesting.property.NestedProperty;
 
 /**
@@ -28,7 +27,7 @@ public class NestingDemo {
 	 * Creates a new demo.
 	 */
 	private NestingDemo() {
-		this.currentEmployee = new SimpleObjectProperty<>(new Employee(54_000));
+		this.currentEmployee = new SimpleObjectProperty<>(new Employee(54000));
 	}
 
 	/**
@@ -55,8 +54,35 @@ private void demoNestedProperties() {
 				.nest(employee -> employee.salaryProperty())
 				.buildProperty();
 
+		System.out
+				.println("Check that the object hierarchy's value is initially the same as the nested property's value.");
+		outputSalaryValues(currentEmployee, currentEmployeesSalary);
+
+		System.out
+				.println("Check that when the object hierarchy's value is changed, the nested property's value changes as well.");
+		currentEmployee.getValue().salaryProperty().setValue(58000);
+		outputSalaryValues(currentEmployee, currentEmployeesSalary);
+
+		System.out
+				.println("Check that when the nested property's value is changed, the object hierarchy's value changes as well.");
+		currentEmployeesSalary.setValue(62000);
+		outputSalaryValues(currentEmployee, currentEmployeesSalary);
+	}
+
+	/**
+	 * Outputs the salary of both specified properties.
+	 *
+	 * @param currentEmployee
+	 *            the property holding the current employee; the printed value is accessed by moving through the object
+	 *            hierarchy
+	 * @param currentEmployeesSalary
+	 *            the nested property holding the current employee's salary; the printed value is accessed by simply
+	 *            getting it
+	 */
+	private static void outputSalaryValues(Property<Employee> currentEmployee, Property<Number> currentEmployeesSalary) {
 		System.out.println("Salary - object hierarchy: " + currentEmployee.getValue().salaryProperty().getValue());
 		System.out.println("Salary - nested property: " + currentEmployeesSalary.getValue());
+		System.out.println();
 	}
 
 	//#end DEMOS

src/org/codefx/libfx/nesting/Nestings.java

@@ -10,8 +10,9 @@
  * outer -> nested -> inner (which is also nested) <br>
  * level 0 -> level 1 -> ...
  * <p>
- * TODO: nomenclature: "observable" = "observable value" TODO: fix names of all generics to some common schema like
- * O(outer) and N(ested)
+ * TODO: nomenclature: "observable" = "observable value"
+ * <p>
+ * TODO: fix names of all generics to some common schema like O(outer) and N(ested)
  * <p>
  * TODO examples; differences between builder types
  * <p>

test/org/codefx/libfx/nesting/AbstractDeepNestingTest.java

@@ -6,7 +6,6 @@
 import javafx.beans.Observable;
 import javafx.beans.value.ObservableValue;
 
-import org.codefx.libfx.nesting.Nesting;
 import org.junit.Test;
 
 /**
@@ -115,14 +114,14 @@ public void testWhenSettingOuterValueToNull() {
 	protected enum Level {
 
 		/**
-		 * A level below the outer level.
+		 * The outer level.
 		 */
-		NESTED,
+		OUTER,
 
 		/**
-		 * The outer level.
+		 * A level below the outer level.
 		 */
-		OUTER,
+		NESTED,
 	}
 
 	/**

test/org/codefx/libfx/nesting/AbstractDeepNestingTestForDefaultNesting.java

@@ -10,7 +10,7 @@
 import org.codefx.libfx.nesting.testhelper.OuterValue;
 
 /**
- * Superclass for tests for deep nestings which are based on the nesting hierarchy in the package
+ * Abstract superclass to tests for deep nestings which are based on the nesting hierarchy in the package
  * {@link org.codefx.libfx.nesting.testhelper testhelper}.
  * <p>
  * It leaves {@link #createNewNestingFromOuterObservable(Observable)} and {@link #getInnerObservable(Observable)}

test/org/codefx/libfx/nesting/AbstractNestingTest.java

@@ -5,7 +5,6 @@
 import javafx.beans.Observable;
 import javafx.beans.value.ObservableValue;
 
-import org.codefx.libfx.nesting.Nesting;
 import org.junit.Before;
 import org.junit.Test;
 

test/org/codefx/libfx/nesting/AbstractShallowNestingTest.java

@@ -1,12 +1,9 @@
 package org.codefx.libfx.nesting;
 
-import org.codefx.libfx.nesting.Nesting;
-import org.codefx.libfx.nesting.ShallowNesting;
-
 import javafx.beans.Observable;
 
 /**
- * Abstract superclass tests of {@link ShallowNesting ShallowNestings}. Implements all abstract methods from
+ * Abstract superclass to tests of {@link ShallowNesting ShallowNestings}. Implements all abstract methods from
  * {@link AbstractNestingTest} except the creation of the nesting.
  *
  * @param <O>

test/org/codefx/libfx/nesting/ShallowNestingTest.java

@@ -5,10 +5,9 @@
 import javafx.beans.Observable;
 import javafx.beans.property.Property;
 import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 
-import org.codefx.libfx.nesting.Nesting;
-import org.codefx.libfx.nesting.ShallowNesting;
 import org.codefx.libfx.nesting.testhelper.SomeValue;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
@@ -19,9 +18,9 @@
  */
 @RunWith(Suite.class)
 @SuiteClasses({
-		ShallowNestingTest.OnObservable.class,
-		ShallowNestingTest.OnObservableValue.class,
-		ShallowNestingTest.OnProperty.class,
+	ShallowNestingTest.OnObservable.class,
+	ShallowNestingTest.OnObservableValue.class,
+	ShallowNestingTest.OnProperty.class,
 })
 public class ShallowNestingTest {
 
@@ -57,15 +56,43 @@ public void removeListener(InvalidationListener arg0) {
 	 * Tests a {@link ShallowNesting} based on an {@link ObservableValue}.
 	 */
 	public static class OnObservableValue
-	extends AbstractShallowNestingTest<ObservableValue<SomeValue>> {
+			extends AbstractShallowNestingTest<ObservableValue<SomeValue>> {
 
 		@Override
 		protected ObservableValue<SomeValue> createNewNestingHierarchy() {
+			final SomeValue someValue = new SomeValue();
+
 			/*
-			 * TODO check whether it would be better to return an implementation of 'ObservableValue' which does not
-			 * also implement other interfaces.
+			 * To return an implementation of the 'ObservableValue' interface which does not also implement other
+			 * interfaces, create an anonymous class. It is assumed that listeners are neither added nor removed.
 			 */
-			return new SimpleObjectProperty<SomeValue>(new SomeValue());
+			return new ObservableValue<SomeValue>() {
+
+				@Override
+				public void addListener(InvalidationListener listener) {
+					fail();
+				}
+
+				@Override
+				public void removeListener(InvalidationListener listener) {
+					fail();
+				}
+
+				@Override
+				public void addListener(ChangeListener<? super SomeValue> listener) {
+					fail();
+				}
+
+				@Override
+				public void removeListener(ChangeListener<? super SomeValue> listener) {
+					fail();
+				}
+
+				@Override
+				public SomeValue getValue() {
+					return someValue;
+				}
+			};
 		}
 	}
 

test/org/codefx/libfx/nesting/property/NestedIntegerPropertyBuilderTest.java

@@ -4,10 +4,6 @@
 import javafx.beans.property.SimpleIntegerProperty;
 
 import org.codefx.libfx.nesting.Nesting;
-import org.codefx.libfx.nesting.property.AbstractNestedPropertyBuilder;
-import org.codefx.libfx.nesting.property.NestedIntegerProperty;
-import org.codefx.libfx.nesting.property.NestedIntegerPropertyBuilder;
-import org.codefx.libfx.nesting.property.NestedProperty;
 import org.codefx.libfx.nesting.testhelper.NestingAccess.EditableNesting;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
@@ -18,16 +14,16 @@
  */
 @RunWith(Suite.class)
 @SuiteClasses({
-		NestedIntegerPropertyBuilderTest.AbstractBuilderContract.class,
-		NestedIntegerPropertyBuilderTest.CreatedProperties.class,
+	NestedIntegerPropertyBuilderTest.AbstractBuilderContract.class,
+	NestedIntegerPropertyBuilderTest.CreatedProperties.class,
 })
 public class NestedIntegerPropertyBuilderTest {
 
 	/**
 	 * Tests whether the builder fulfills the contract defined by {@link AbstractNestedPropertyBuilder}.
 	 */
 	public static class AbstractBuilderContract
-	extends AbstractNestedPropertyBuilderTest<IntegerProperty, NestedIntegerProperty> {
+			extends AbstractNestedPropertyBuilderTest<IntegerProperty, NestedIntegerProperty> {
 
 		@Override
 		protected AbstractNestedPropertyBuilder<IntegerProperty, NestedIntegerProperty> createBuilder() {

test/org/codefx/libfx/nesting/testhelper/NestingAccess.java

@@ -13,8 +13,8 @@
 import org.codefx.libfx.nesting.Nesting;
 
 /**
- * Provides simple usability functions to access an outer observables nesting hierarchy in a more readable way. To that
- * end many arguments and return types can be null (see method comments).
+ * Provides simple usability functions to access an outer observable's nesting hierarchy in a more readable way. To that
+ * end, many arguments and return types can be null (see method comments).
  */
 public class NestingAccess {
 
@@ -25,8 +25,8 @@ public class NestingAccess {
 	 *            the type of observable the nesting contains
 	 * @param nesting
 	 *            the nesting whose observable will be returned
-	 * @return {@link Nesting#innerObservable()}.{@link ReadOnlyProperty#getValue() getValue()}.{@link Optional#get()};
-	 *         can be null
+	 * @return {@link Nesting#innerObservable()}.{@link ReadOnlyProperty#getValue() getValue()}.{@link Optional#get()
+	 *         get()}; can be null
 	 */
 	public static <O extends Observable> O getNestingObservable(Nesting<O> nesting) {
 		Objects.requireNonNull(nesting, "The argument 'nesting' must not be null.");