X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FOptions.java;h=83444bb6b34b4297c681de4c87afcf8f753da605;hb=c4eb31ab64627adfdeed2a445d67883371203e99;hp=bf51e02299f4fcc9bf1381a908fc19ff7d32f7cd;hpb=16cd01e280e5a4c0d7e6d5f45cc4cafd24de3e8b;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/Options.java b/src/main/java/net/pterodactylus/sone/core/Options.java
index bf51e02..83444bb 100644
--- 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 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.
@@ -68,9 +68,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);
 
@@ -127,7 +126,7 @@ public class Options {
 		private volatile T value;
 
 		/** The validator. */
-		private Validator<T> validator;
+		private Predicate<T> validator;
 
 		/** The option watcher. */
 		private final OptionWatcher<T> optionWatcher;
@@ -150,7 +149,7 @@ public class Options {
 		 * @param validator
 		 *            The validator for value validation (may be {@code null})
 		 */
-		public DefaultOption(T defaultValue, Validator<T> validator) {
+		public DefaultOption(T defaultValue, Predicate<T> validator) {
 			this(defaultValue, validator, null);
 		}
 
@@ -176,53 +175,35 @@ public class Options {
 		 * @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, OptionWatcher<T> optionWatcher) {
 			this.defaultValue = defaultValue;
 			this.validator = validator;
 			this.optionWatcher = optionWatcher;
 		}
 
-		/**
-		 * {@inheritDoc}
-		 */
 		@Override
 		public T getDefault() {
 			return defaultValue;
 		}
 
-		/**
-		 * {@inheritDoc}
-		 */
 		@Override
 		public T get() {
 			return (value != null) ? value : defaultValue;
 		}
 
-		/**
-		 * Returns the real value of the option. This will also return an unset
-		 * value (usually {@code null})!
-		 *
-		 * @return The real value of the option
-		 */
 		@Override
 		public T getReal() {
 			return value;
 		}
 
-		/**
-		 * {@inheritDoc}
-		 */
 		@Override
 		public boolean validate(T value) {
-			return (validator == null) || (value == null) || validator.validate(value);
+			return (validator == null) || (value == null) || validator.apply(value);
 		}
 
-		/**
-		 * {@inheritDoc}
-		 */
 		@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;
@@ -329,6 +310,8 @@ public class Options {
 	/**
 	 * Adds an {@link Enum} {@link Option}.
 	 *
+	 * @param <T>
+	 *            The enum type
 	 * @param name
 	 *            The name of the option
 	 * @param enumOption
@@ -350,6 +333,8 @@ public class Options {
 	 * options.&lt;SomeEnum&gt; getEnumOption(&quot;SomeEnumOption&quot;).get();
 	 * </pre>
 	 *
+	 * @param <T>
+	 *            The enum type
 	 * @param name
 	 *            The name of the option
 	 * @return The enum option, or {@code null} if there is no enum option with