Finished calling fields "fields" instead of "attributes".

nicolaiparlog · nicolaiparlog · commit f10d04da663c · 2014-11-22T08:25:29.000+01:00
diff --git a/src/demo/java/org/codefx/libfx/nesting/NestedDemo.java b/src/demo/java/org/codefx/libfx/nesting/NestedDemo.java
@@ -17,14 +17,14 @@
  */
 public class NestedDemo {
 
-	// #region ATTRIBUTES
+	// #region FIELDS
 
 	/**
 	 * The currently selected employee.
 	 */
 	private final Property<Employee> currentEmployee;
 
-	//#end ATTRIBUTES
+	//#end FIELDS
 
 	// #region CONSTRUCTION & MAIN
 
diff --git a/src/main/java/org/codefx/libfx/concurrent/when/ExecuteAlwaysWhen.java b/src/main/java/org/codefx/libfx/concurrent/when/ExecuteAlwaysWhen.java
@@ -58,7 +58,7 @@ public class ExecuteAlwaysWhen<T> {
 	 * on the first execution of the action.
 	 */
 
-	// #region ATTRIBUTES
+	// #region FIELDS
 
 	/**
 	 * The {@link ObservableValue} upon whose value the action's execution depends.
@@ -95,7 +95,7 @@ public class ExecuteAlwaysWhen<T> {
 	 */
 	private final AtomicBoolean alreadyExecuted;
 
-	// #end ATTRIBUTES
+	// #end FIELDS
 
 	/**
 	 * Creates a new instance from the specified arguments. *
diff --git a/src/main/java/org/codefx/libfx/concurrent/when/ExecuteOnceWhen.java b/src/main/java/org/codefx/libfx/concurrent/when/ExecuteOnceWhen.java
@@ -48,7 +48,7 @@ public class ExecuteOnceWhen<T> {
 	 * condition, it is checked (and set to false). If it contained true, the action will be executed.
 	 */
 
-	// #region ATTRIBUTES
+	// #region FIELDS
 
 	/**
 	 * The {@link ObservableValue} upon whose value the action's execution depends.
@@ -81,7 +81,7 @@ public class ExecuteOnceWhen<T> {
 	 */
 	private final AtomicBoolean executeWhenWasAlreadyCalled;
 
-	// #end ATTRIBUTES
+	// #end FIELDS
 
 	/**
 	 * Creates a new instance from the specified arguments.
diff --git a/src/main/java/org/codefx/libfx/control/properties/AbstractControlPropertyListenerHandle.java b/src/main/java/org/codefx/libfx/control/properties/AbstractControlPropertyListenerHandle.java
@@ -11,7 +11,7 @@
  */
 abstract class AbstractControlPropertyListenerHandle implements ControlPropertyListenerHandle {
 
-	// #region ATTRIBUTES
+	// #region FIELDS
 
 	/**
 	 * The properties to which the {@link #listener} will be added.
@@ -33,7 +33,7 @@ abstract class AbstractControlPropertyListenerHandle implements ControlPropertyL
 	 */
 	private boolean attached;
 
-	// #end ATTRIBUTES
+	// #end FIELDS
 
 	// #region CONSTRUCTION
 
diff --git a/src/main/java/org/codefx/libfx/control/properties/ControlPropertyListenerBuilder.java b/src/main/java/org/codefx/libfx/control/properties/ControlPropertyListenerBuilder.java
@@ -24,7 +24,7 @@
  */
 public class ControlPropertyListenerBuilder<T> {
 
-	// #region ATTRIBUTES
+	// #region FIELDS
 
 	/**
 	 * The properties which will be observed.
@@ -46,7 +46,7 @@ public class ControlPropertyListenerBuilder<T> {
 	 */
 	private Optional<Class<T>> valueType;
 
-	// #end ATTRIBUTES
+	// #end FIELDS
 
 	// #region CONSTRUCTION & SETTING VALUES
 
@@ -160,7 +160,7 @@ public ControlPropertyListenerHandle buildDetached() {
 	}
 
 	/**
-	 * Checks whether the attributes are valid so they can be used to {@link #buildDetached()} a listener.
+	 * Checks whether the fields are valid so they can be used to {@link #buildDetached() build} a listener.
 	 */
 	private void checkFields() {
 		if (key == null)
diff --git a/src/main/java/org/codefx/libfx/control/webview/DefaultWebViewHyperlinkListenerHandle.java b/src/main/java/org/codefx/libfx/control/webview/DefaultWebViewHyperlinkListenerHandle.java
@@ -37,7 +37,7 @@ class DefaultWebViewHyperlinkListenerHandle implements WebViewHyperlinkListenerH
 	 * it easier, all instances of org.w3c.dom classes carry a 'dom'-prefix.
 	 */
 
-	// #region ATTRIBUTES
+	// #region FIELDS
 
 	/**
 	 * The {@link WebView} to which the {@link #domEventListener} will be attached.
@@ -78,7 +78,7 @@ class DefaultWebViewHyperlinkListenerHandle implements WebViewHyperlinkListenerH
 	 */
 	private boolean attached;
 
-	// #end ATTRIBUTES
+	// #end FIELDS
 
 	/**
 	 * Creates a new listener handle for the specified arguments. The listener is not attached to the web view.
diff --git a/src/main/java/org/codefx/libfx/nesting/AbstractNestingBuilderOnObservable.java b/src/main/java/org/codefx/libfx/nesting/AbstractNestingBuilderOnObservable.java
@@ -9,8 +9,8 @@
 import javafx.beans.Observable;
 import javafx.beans.value.ObservableValue;
 
-import org.codefx.libfx.nesting.listener.NestedInvalidationListenerHandle;
 import org.codefx.libfx.nesting.listener.NestedInvalidationListenerBuilder;
+import org.codefx.libfx.nesting.listener.NestedInvalidationListenerHandle;
 
 /**
  * A superclass for builders for all kinds of nested functionality. Holds the nesting hierarchy (outer observable and
@@ -217,7 +217,7 @@ public NestingConstructionKit() {
 
 		//#end CONSTRUCTOR
 
-		// #region PROPERTY ACCESS
+		// #region ACCESSORS
 
 		/**
 		 * @return the outer {@link ObservableValue}
@@ -243,7 +243,7 @@ public List<NestingStep> getNestingSteps() {
 			return nestingSteps;
 		}
 
-		//#end PROPERTY ACCESS
+		//#end ACCESSORS
 
 	}
 
diff --git a/src/main/java/org/codefx/libfx/nesting/DeepNesting.java b/src/main/java/org/codefx/libfx/nesting/DeepNesting.java
@@ -182,7 +182,7 @@ private void updateNestingFromLevel(int startLevel) {
 		new NestingUpdater(startLevel).update();
 	}
 
-	// #region PROPERTY ACCESS
+	// #region ACCESSORS
 
 	/**
 	 * {@inheritDoc}
@@ -192,7 +192,7 @@ public ReadOnlyProperty<Optional<O>> innerObservableProperty() {
 		return inner;
 	}
 
-	//#end PROPERTY ACCESS
+	//#end ACCESSORS
 
 	// #region PRIVATE CLASSES
 
diff --git a/src/main/java/org/codefx/libfx/nesting/property/AbstractNestedPropertyBuilder.java b/src/main/java/org/codefx/libfx/nesting/property/AbstractNestedPropertyBuilder.java
@@ -63,7 +63,7 @@ protected AbstractNestedPropertyBuilder(Nesting<O> nesting) {
 
 	//#end ABSTRACT METHODS
 
-	// #region PROPERTY ACCESS
+	// #region ACCESSORS
 
 	/**
 	 * @return the nesting which will be used for all nested properties
@@ -133,6 +133,6 @@ public AbstractNestedPropertyBuilder<O, P> setName(String name) {
 		return this;
 	}
 
-	//#end PROPERTY ACCESS
+	//#end ACCESSORS
 
 }
diff --git a/src/main/java/org/codefx/libfx/serialization/SerializableOptional.java b/src/main/java/org/codefx/libfx/serialization/SerializableOptional.java
@@ -79,7 +79,7 @@
  */
 public final class SerializableOptional<T extends Serializable> implements Serializable {
 
-	// ATTRIBUTES
+	// FIELDS
 
 	@SuppressWarnings("javadoc")
 	private static final long serialVersionUID = -652697447004597911L;
diff --git a/src/test/java/org/codefx/libfx/concurrent/when/ExecuteAlwaysWhenTest.java b/src/test/java/org/codefx/libfx/concurrent/when/ExecuteAlwaysWhenTest.java
@@ -18,7 +18,7 @@
  */
 public class ExecuteAlwaysWhenTest {
 
-	// #region ATTRIBUTES & INITIALIZATION
+	// #region FIELDS & INITIALIZATION
 
 	/**
 	 * The string which passes the {@link #ACTION_GATEWAY}.
@@ -60,7 +60,7 @@ public void setUp() {
 		action = string -> executedActionCount.incrementAndGet();
 	}
 
-	// #end ATTRIBUTES & INITIALIZATION
+	// #end FIELDS & INITIALIZATION
 
 	// #region SINGLE-THREADED TESTS
 
diff --git a/src/test/java/org/codefx/libfx/concurrent/when/ExecuteOnceWhenTest.java b/src/test/java/org/codefx/libfx/concurrent/when/ExecuteOnceWhenTest.java
@@ -22,7 +22,7 @@
  */
 public class ExecuteOnceWhenTest {
 
-	// #region ATTRIBUTES & INITIALIZATION
+	// #region FIELDS & INITIALIZATION
 
 	/**
 	 * The string which passes the {@link #ACTION_CONDITION}.
@@ -64,7 +64,7 @@ public void setUp() {
 		action = string -> executedActionCount.incrementAndGet();
 	}
 
-	// #end ATTRIBUTES & INITIALIZATION
+	// #end FIELDS & INITIALIZATION
 
 	// #region SINGLE-THREADED TESTS
 
diff --git a/src/test/java/org/codefx/libfx/control/properties/AbstractControlPropertyListenerHandleTest.java b/src/test/java/org/codefx/libfx/control/properties/AbstractControlPropertyListenerHandleTest.java
@@ -24,7 +24,7 @@
  */
 public abstract class AbstractControlPropertyListenerHandleTest {
 
-	// #region ATTRIBUTES
+	// #region FIELDS
 
 	/**
 	 * A key to which the created listeners listen.
@@ -51,12 +51,12 @@ public abstract class AbstractControlPropertyListenerHandleTest {
 	 */
 	private Consumer<String> valueProcessorWhichFailsTestWhenCalled;
 
-	// #end ATTRIBUTES
+	// #end FIELDS
 
 	// #region SETUP
 
 	/**
-	 * Initializes attributes for tests.
+	 * Initializes fields for tests.
 	 */
 	@Before
 	@SuppressWarnings("unchecked")
diff --git a/src/test/java/org/codefx/libfx/control/properties/ControlPropertiesTest.java b/src/test/java/org/codefx/libfx/control/properties/ControlPropertiesTest.java
@@ -29,7 +29,7 @@ public class ControlPropertiesTest {
 	 */
 	public static class BuilderContract {
 
-		// #region ATTRIBUTES
+		// #region FIELDS
 
 		/**
 		 * The key used to create the listeners.
@@ -46,10 +46,10 @@ public static class BuilderContract {
 		 */
 		private ObservableMap<Object, Object> properties;
 
-		// #end ATTRIBUTES
+		// #end FIELDS
 
 		/**
-		 * Initializes the attributes.
+		 * Initializes the fields.
 		 */
 		@Before
 		public void setUp() {
@@ -118,7 +118,7 @@ public void testIllegalStateExceptionOnBuildWithoutValueProcessor() {
 		// SUCCESSFUL CONSTRUCTION
 
 		/**
-		 * Tests whether building is successful when the minimum of attributes is set.
+		 * Tests whether building is successful when the minimum of values is set.
 		 */
 		public void testSuccessfulBuild() {
 			ControlProperties.<String> on(properties)
diff --git a/src/test/java/org/codefx/libfx/dom/AbstractEventTransformerTest.java b/src/test/java/org/codefx/libfx/dom/AbstractEventTransformerTest.java
@@ -28,7 +28,7 @@
  */
 public abstract class AbstractEventTransformerTest {
 
-	// #region ATTRIBUTES & INITIALIZATION
+	// #region FIELDS & INITIALIZATION
 
 	/**
 	 * The URL used for all links.
@@ -74,11 +74,11 @@ public void setUp() throws Exception {
 		simpleLink = (EventTarget) htmlDocument.getElementById(SIMPLE_LINK_ID);
 	}
 
-	// #end ATTRIBUTES & INITIALIZATION
+	// #end FIELDS & INITIALIZATION
 
 	// #region TESTS
 
-	// #end ATTRIBUTES & INITIALIZATION
+	// #end FIELDS & INITIALIZATION
 
 	// #region TESTS
 
diff --git a/src/test/java/org/codefx/libfx/dom/DefaultEventTransformerTest.java b/src/test/java/org/codefx/libfx/dom/DefaultEventTransformerTest.java
@@ -9,7 +9,7 @@
  */
 public class DefaultEventTransformerTest extends AbstractEventTransformerTest {
 
-	// #region ATTRIBUTES & INITIALIZATION
+	// #region FIELDS & INITIALIZATION
 
 	/**
 	 * The tested {@link DefaultEventTransformer}.
@@ -22,7 +22,7 @@ public void setUp() throws Exception {
 		transformer = new DefaultEventTransformer();
 	}
 
-	// #end ATTRIBUTES & INITIALIZATION
+	// #end FIELDS & INITIALIZATION
 
 	@Override
 	protected boolean canTransformToHyperlinkEvent(Event domEvent) {
diff --git a/src/test/java/org/codefx/libfx/nesting/property/AbstractNestedPropertyTest.java b/src/test/java/org/codefx/libfx/nesting/property/AbstractNestedPropertyTest.java
@@ -266,7 +266,7 @@ public void testChangingOldObservablesValue() {
 
 	//#end ABSTRACT METHODS
 
-	// #region ATTRIBUTE ACCESS
+	// #region ACCESSORS
 
 	/**
 	 * @return the nesting on which the tested property is based
@@ -289,6 +289,6 @@ public T getPropertyValue() {
 		return property.getValue();
 	}
 
-	//#end ATTRIBUTE ACCESS
+	//#end ACCESSORS
 
 }
diff --git a/src/test/java/org/codefx/libfx/nesting/testhelper/InnerValue.java b/src/test/java/org/codefx/libfx/nesting/testhelper/InnerValue.java
@@ -68,7 +68,7 @@ public static InnerValue createWithObservables() {
 
 // #end CONSTRUCTOR
 
-// #region PROPERTY ACCESS
+// #region ACCESSORS
 
 	/**
 	 * An observable.
@@ -97,6 +97,6 @@ public IntegerProperty integerProperty() {
 		return integerProperty;
 	}
 
-// #end PROPERTY ACCESS
+// #end ACCESSORS
 
 }

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ private void updateNestingFromLevel(int startLevel) {`
`182`	`182`	`new NestingUpdater(startLevel).update();`
`183`	`183`	`}`
`184`	`184`
`185`		`- // #region PROPERTY ACCESS`
	`185`	`+ // #region ACCESSORS`
`186`	`186`
`187`	`187`	`/**`
`188`	`188`	`* {@inheritDoc}`
`@@ -192,7 +192,7 @@ public ReadOnlyProperty<Optional<O>> innerObservableProperty() {`
`192`	`192`	`return inner;`
`193`	`193`	`}`
`194`	`194`
`195`		`- //#end PROPERTY ACCESS`
	`195`	`+ //#end ACCESSORS`
`196`	`196`
`197`	`197`	`// #region PRIVATE CLASSES`
`198`	`198`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ protected AbstractNestedPropertyBuilder(Nesting<O> nesting) {`
`63`	`63`
`64`	`64`	`//#end ABSTRACT METHODS`
`65`	`65`
`66`		`- // #region PROPERTY ACCESS`
	`66`	`+ // #region ACCESSORS`
`67`	`67`
`68`	`68`	`/**`
`69`	`69`	`* @return the nesting which will be used for all nested properties`
`@@ -133,6 +133,6 @@ public AbstractNestedPropertyBuilder<O, P> setName(String name) {`
`133`	`133`	`return this;`
`134`	`134`	`}`
`135`	`135`
`136`		`- //#end PROPERTY ACCESS`
	`136`	`+ //#end ACCESSORS`
`137`	`137`
`138`	`138`	`}`