Remove option watcher, it’s not used anymore.

[Sone.git] / src / main / java / net / pterodactylus / sone / core / Options.java

diff --git a/src/main/java/net/pterodactylus/sone/core/Options.java b/src/main/java/net/pterodactylus/sone/core/Options.java
index 7dea2c7..34fc9a3 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/Options.java
+++ b/src/main/java/net/pterodactylus/sone/core/Options.java
@@ -1,5 +1,5 @@
 /*
- * Sone - Options.java - Copyright © 2010–2012 David Roden
+ * Sone - Options.java - Copyright © 2010–2013 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import net.pterodactylus.util.validation.Validator;
+import com.google.common.base.Predicate;
 
 /**
  * Stores various options that influence Sone’s behaviour.
@@ -40,13 +40,6 @@ public class Options {
        public static interface Option<T> {
 
                /**
-                * Returns the default value of the option.
-                *
-                * @return The default value of the option
-                */
-               public T getDefault();
-
-               /**
                 * Returns the current value of the option. If the current value is not
                 * set (usually {@code null}), the default value is returned.
                 *
@@ -68,9 +61,8 @@ public class Options {
                 *
                 * @param value
                 *            The value to validate
-                * @return {@code true} if this option does not have a {@link Validator}
-                *         , or the {@link Validator} validates this object,
-                *         {@code false} otherwise
+                * @return {@code true} if this option does not have a validator, or the
+                *         validator validates this object, {@code false} otherwise
                 */
                public boolean validate(T value);
 
@@ -87,32 +79,7 @@ public class Options {
        }
 
        /**
-        * Interface for objects that want to be notified when an option changes its
-        * value.
-        *
-        * @param <T>
-        *            The type of the option
-        * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
-        */
-       public static interface OptionWatcher<T> {
-
-               /**
-                * Notifies an object that an option has been changed.
-                *
-                * @param option
-                *            The option that has changed
-                * @param oldValue
-                *            The old value of the option
-                * @param newValue
-                *            The new value of the option
-                */
-               public void optionChanged(Option<T> option, T oldValue, T newValue);
-
-       }
-
-       /**
-        * Basic implementation of an {@link Option} that notifies an
-        * {@link OptionWatcher} if the value changes.
+        * Basic implementation of an {@link Option}.
         *
         * @param <T>
         *            The type of the option
@@ -127,10 +94,7 @@ public class Options {
                private volatile T value;
 
                /** The validator. */
-               private Validator<T> validator;
-
-               /** The option watcher. */
-               private final OptionWatcher<T> optionWatcher;
+               private Predicate<T> validator;
 
                /**
                 * Creates a new default option.
@@ -139,31 +103,7 @@ public class Options {
                 *            The default value of the option
                 */
                public DefaultOption(T defaultValue) {
-                       this(defaultValue, (OptionWatcher<T>) null);
-               }
-
-               /**
-                * Creates a new default option.
-                *
-                * @param defaultValue
-                *            The default value of the option
-                * @param validator
-                *            The validator for value validation (may be {@code null})
-                */
-               public DefaultOption(T defaultValue, Validator<T> validator) {
-                       this(defaultValue, validator, null);
-               }
-
-               /**
-                * Creates a new default option.
-                *
-                * @param defaultValue
-                *            The default value of the option
-                * @param optionWatchers
-                *            The option watchers (may be {@code null})
-                */
-               public DefaultOption(T defaultValue, OptionWatcher<T> optionWatchers) {
-                       this(defaultValue, null, optionWatchers);
+                       this(defaultValue, null);
                }
 
                /**
@@ -173,21 +113,10 @@ public class Options {
                 *            The default value of the option
                 * @param validator
                 *            The validator for value validation (may be {@code null})
-                * @param optionWatcher
-                *            The option watcher (may be {@code null})
                 */
-               public DefaultOption(T defaultValue, Validator<T> validator, OptionWatcher<T> optionWatcher) {
+               public DefaultOption(T defaultValue, Predicate<T> validator) {
                        this.defaultValue = defaultValue;
                        this.validator = validator;
-                       this.optionWatcher = optionWatcher;
-               }
-
-               /**
-                * {@inheritDoc}
-                */
-               @Override
-               public T getDefault() {
-                       return defaultValue;
                }
 
                /**
@@ -214,7 +143,7 @@ public class Options {
                 */
                @Override
                public boolean validate(T value) {
-                       return (validator == null) || (value == null) || validator.validate(value);
+                       return (validator == null) || (value == null) || validator.apply(value);
                }
 
                /**
@@ -222,16 +151,11 @@ public class Options {
                 */
                @Override
                public void set(T value) {
-                       if ((value != null) && (validator != null) && (!validator.validate(value))) {
+                       if ((value != null) && (validator != null) && (!validator.apply(value))) {
                                throw new IllegalArgumentException("New Value (" + value + ") could not be validated.");
                        }
                        T oldValue = this.value;
                        this.value = value;
-                       if (!get().equals(oldValue)) {
-                               if (optionWatcher != null) {
-                                       optionWatcher.optionChanged(this, oldValue, get());
-                               }
-                       }
                }
 
        }