'WebViewHyperlinkListenerHandle' implements 'ListenerHandle' contract.

Author: nicolaiparlog

src/main/java/org/codefx/libfx/control/webview/DefaultWebViewHyperlinkListenerHandle.java

@@ -69,14 +69,19 @@ class DefaultWebViewHyperlinkListenerHandle implements WebViewHyperlinkListenerH
 	 * Executes {@link #attachListenerInApplicationThread()} each time the web view's load worker changes its state to
 	 * {@link State#SUCCEEDED SUCCEEDED}.
 	 * <p>
-	 * The executer is only present while the listener is attached.
+	 * The executer is only present while the listener is {@link #attached}.
 	 */
 	private Optional<ExecuteAlwaysWhen<State>> attachWhenLoadSucceeds;
 
+	/**
+	 * Indicates whether the listener is currently attached.
+	 */
+	private boolean attached;
+
 	// #end ATTRIBUTES
 
 	/**
-	 * Creates a new listener handle for the specified arguments.
+	 * Creates a new listener handle for the specified arguments. The listener is not attached to the web view.
 	 *
 	 * @param webView
 	 *            the {@link WebView} to which the {@code eventListener} will be attached
@@ -103,6 +108,10 @@ public DefaultWebViewHyperlinkListenerHandle(
 
 	@Override
 	public void attach() {
+		if (attached)
+			return;
+
+		attached = true;
 		if (Platform.isFxApplicationThread())
 			attachInApplicationThreadEachTimeLoadSucceeds();
 		else
@@ -144,6 +153,10 @@ private void attachListenerInApplicationThread() {
 
 	@Override
 	public void detach() {
+		if (!attached)
+			return;
+
+		attached = false;
 		if (Platform.isFxApplicationThread())
 			detachInApplicationThread();
 		else

src/main/java/org/codefx/libfx/control/webview/WebViewHyperlinkListenerHandle.java

@@ -7,6 +7,9 @@
 
 /**
  * A {@link ListenerHandle} for a {@link WebViewHyperlinkListener}.
+ *
+ * @see ListenerHandle
+ * @see WebViewHyperlinkListener
  */
 public interface WebViewHyperlinkListenerHandle extends ListenerHandle {
 
@@ -17,6 +20,8 @@ public interface WebViewHyperlinkListenerHandle extends ListenerHandle {
 	 * {@link WebEngine#getLoadWorker() loadWorker}. If it is not called on the FX Application Thread, the listener will
 	 * be added at some unspecified time in the future. If the {@code loadWorker} is currently loading, the listener is
 	 * attached as soon as it is done.
+	 *
+	 * @see ListenerHandle#attach()
 	 */
 	@Override
 	void attach();
@@ -26,6 +31,8 @@ public interface WebViewHyperlinkListenerHandle extends ListenerHandle {
 	 * <p>
 	 * This method can be called from any thread and regardless of the state of the {@code WebView}'s
 	 * {@link WebEngine#getLoadWorker() loadWorker}.
+	 *
+	 * @see ListenerHandle#detach()
 	 */
 	@Override
 	void detach();