Restructured inheritance of nesting builders.

Author: nicolaiparlog

src/org/codefx/libfx/nesting/AbstractNestingBuilder.java renamed to src/org/codefx/libfx/nesting/AbstractNestingBuilderOnObservable.java

@@ -20,7 +20,7 @@
  * @param <O>
  *            the type of observable this builder can build;
  */
-abstract class AbstractNestingBuilder<T, O extends Observable> {
+abstract class AbstractNestingBuilderOnObservable<T, O extends Observable> {
 
 	/*
 	 * A builder can either be the outer or a nested builder of a nesting. In the first case, 'outerObservable' is
@@ -40,7 +40,7 @@ abstract class AbstractNestingBuilder<T, O extends Observable> {
 	 * The previous builder upon which this builder depends. This is only non-null for nested builders (indicated by
 	 * {@link #isOuterBuilder()}).
 	 */
-	private final AbstractNestingBuilder<?, ?> previousBuilder;
+	private final AbstractNestingBuilderOnObservable<?, ?> previousBuilder;
 
 	/**
 	 * The function which performs the {@link NestingStep} from an instance of the previous builder's wrapped type to
@@ -58,7 +58,7 @@ abstract class AbstractNestingBuilder<T, O extends Observable> {
 	 * @param outerObservable
 	 *            the outer observable upon which the constructed nesting depends
 	 */
-	protected AbstractNestingBuilder(O outerObservable) {
+	protected AbstractNestingBuilderOnObservable(O outerObservable) {
 		Objects.requireNonNull(outerObservable, "The argument 'outerObservable' must not be null.");
 
 		this.outerObservable = outerObservable;
@@ -77,8 +77,8 @@ protected AbstractNestingBuilder(O outerObservable) {
 	 * @param nestingStep
 	 *            the function which performs the nesting step from one observable to the next
 	 */
-	protected <P> AbstractNestingBuilder(
-			AbstractNestingBuilder<P, ?> previousBuilder, NestingStep<P, ? extends O> nestingStep) {
+	protected <P> AbstractNestingBuilderOnObservable(
+			AbstractNestingBuilderOnObservable<P, ?> previousBuilder, NestingStep<P, ? extends O> nestingStep) {
 
 		Objects.requireNonNull(previousBuilder, "The argument 'previousBuilder' must not be null.");
 		Objects.requireNonNull(nestingStep, "The argument 'nestingStep' must not be null.");

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

@@ -0,0 +1,46 @@
+package org.codefx.libfx.nesting;
+
+import javafx.beans.value.ObservableValue;
+
+/**
+ * A nesting builder which allows adding change listeners.
+ *
+ * @param <T>
+ *            the type of the wrapped value
+ * @param <O>
+ *            the type of observable this builder can build
+ */
+abstract class AbstractNestingBuilderOnObservableValue<T, O extends ObservableValue<T>>
+		extends AbstractNestingBuilderOnObservable<T, O> {
+
+	// #region CONSTRUCTION
+
+	/**
+	 * Creates a new nesting builder which acts as the outer builder.
+	 *
+	 * @param outerObservable
+	 *            the outer observable upon which the constructed nesting depends
+	 */
+	protected AbstractNestingBuilderOnObservableValue(O outerObservable) {
+		super(outerObservable);
+	}
+
+	/**
+	 * Creates a new nesting builder which acts as a nested builder.
+	 *
+	 * @param <P>
+	 *            the type the previous builder wraps
+	 * @param previousNestedBuilder
+	 *            the previous builder
+	 * @param nestingStep
+	 *            the function which performs the nesting step from one observable to the next
+	 */
+	protected <P> AbstractNestingBuilderOnObservableValue(
+			AbstractNestingBuilderOnObservable<P, ?> previousNestedBuilder, NestingStep<P, O> nestingStep) {
+
+		super(previousNestedBuilder, nestingStep);
+	}
+
+	//#end CONSTRUCTION
+
+}

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

@@ -0,0 +1,46 @@
+package org.codefx.libfx.nesting;
+
+import javafx.beans.property.Property;
+
+/**
+ * A nesting builder which allows bindings.
+ *
+ * @param <T>
+ *            the type of the wrapped value
+ * @param <O>
+ *            the type of observable this builder can build
+ */
+abstract class AbstractNestingBuilderOnProperty<T, O extends Property<T>>
+		extends AbstractNestingBuilderOnObservableValue<T, O> {
+
+	// #region CONSTRUCTION
+
+	/**
+	 * Creates a new nesting builder which acts as the outer builder.
+	 *
+	 * @param outerObservable
+	 *            the outer observable upon which the constructed nesting depends
+	 */
+	protected AbstractNestingBuilderOnProperty(O outerObservable) {
+		super(outerObservable);
+	}
+
+	/**
+	 * Creates a new nesting builder which acts as a nested builder.
+	 *
+	 * @param <P>
+	 *            the type the previous builder wraps
+	 * @param previousNestedBuilder
+	 *            the previous builder
+	 * @param nestingStep
+	 *            the function which performs the nesting step from one observable to the next
+	 */
+	protected <P> AbstractNestingBuilderOnProperty(
+			AbstractNestingBuilderOnObservable<P, ?> previousNestedBuilder, NestingStep<P, O> nestingStep) {
+
+		super(previousNestedBuilder, nestingStep);
+	}
+
+	//#end CONSTRUCTION
+
+}

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

@@ -8,7 +8,7 @@
 /**
  * A builder for all kinds of nested functionality whose innermost value is held by a {@link BooleanProperty}.
  */
-public class BooleanPropertyNestingBuilder extends AbstractNestingBuilder<Boolean, BooleanProperty> {
+public class BooleanPropertyNestingBuilder extends AbstractNestingBuilderOnProperty<Boolean, BooleanProperty> {
 
 	// #region CONSTRUCTION
 
@@ -23,7 +23,7 @@ public class BooleanPropertyNestingBuilder extends AbstractNestingBuilder<Boolea
 	 *            the function which performs the nesting step from one observable to the next
 	 */
 	<P> BooleanPropertyNestingBuilder(
-			AbstractNestingBuilder<P, ?> previousNestedBuilder,
+			AbstractNestingBuilderOnObservableValue<P, ?> previousNestedBuilder,
 			NestingStep<P, BooleanProperty> nestingStep) {
 
 		super(previousNestedBuilder, nestingStep);

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

@@ -8,7 +8,7 @@
 /**
  * A builder for all kinds of nested functionality whose innermost value is held by a {@link DoubleProperty}.
  */
-public class DoublePropertyNestingBuilder extends AbstractNestingBuilder<Number, DoubleProperty> {
+public class DoublePropertyNestingBuilder extends AbstractNestingBuilderOnProperty<Number, DoubleProperty> {
 
 	// #region CONSTRUCTION
 
@@ -23,7 +23,7 @@ public class DoublePropertyNestingBuilder extends AbstractNestingBuilder<Number,
 	 *            the function which performs the nesting step from one observable to the next
 	 */
 	<P> DoublePropertyNestingBuilder(
-			AbstractNestingBuilder<P, ?> previousNestedBuilder,
+			AbstractNestingBuilderOnObservableValue<P, ?> previousNestedBuilder,
 			NestingStep<P, DoubleProperty> nestingStep) {
 
 		super(previousNestedBuilder, nestingStep);

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

@@ -8,7 +8,7 @@
 /**
  * A builder for all kinds of nested functionality whose innermost value is held by a {@link FloatProperty}.
  */
-public class FloatPropertyNestingBuilder extends AbstractNestingBuilder<Number, FloatProperty> {
+public class FloatPropertyNestingBuilder extends AbstractNestingBuilderOnProperty<Number, FloatProperty> {
 
 	// #region CONSTRUCTION
 
@@ -23,7 +23,7 @@ public class FloatPropertyNestingBuilder extends AbstractNestingBuilder<Number,
 	 *            the function which performs the nesting step from one observable to the next
 	 */
 	<P> FloatPropertyNestingBuilder(
-			AbstractNestingBuilder<P, ?> previousNestedBuilder,
+			AbstractNestingBuilderOnObservableValue<P, ?> previousNestedBuilder,
 			NestingStep<P, FloatProperty> nestingStep) {
 
 		super(previousNestedBuilder, nestingStep);

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

@@ -8,7 +8,7 @@
 /**
  * A builder for all kinds of nested functionality whose innermost value is held by an {@link IntegerProperty}.
  */
-public class IntegerPropertyNestingBuilder extends AbstractNestingBuilder<Number, IntegerProperty> {
+public class IntegerPropertyNestingBuilder extends AbstractNestingBuilderOnProperty<Number, IntegerProperty> {
 
 	// #region CONSTRUCTION
 
@@ -23,7 +23,7 @@ public class IntegerPropertyNestingBuilder extends AbstractNestingBuilder<Number
 	 *            the function which performs the nesting step from one observable to the next
 	 */
 	<P> IntegerPropertyNestingBuilder(
-			AbstractNestingBuilder<P, ?> previousNestedBuilder,
+			AbstractNestingBuilderOnObservableValue<P, ?> previousNestedBuilder,
 			NestingStep<P, IntegerProperty> nestingStep) {
 
 		super(previousNestedBuilder, nestingStep);