X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FOptions.java;h=6a945b9820e4e169107333152dbe8adc3003ba7f;hb=dbb47149d5e2c1e67ec9889587ff24dd7c622862;hp=94fbec1b41ed17d8b95259b421f8337e68fb5b55;hpb=6023bbd61648c16270edb6c59b24f61d648bb982;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 94fbec1..6a945b9 100644
--- a/src/main/java/net/pterodactylus/sone/core/Options.java
+++ b/src/main/java/net/pterodactylus/sone/core/Options.java
@@ -24,6 +24,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import net.pterodactylus.util.validation.Validator;
+
 /**
  * Stores various options that influence Sone’s behaviour.
  *
@@ -64,12 +66,26 @@ public class Options {
 		public T getReal();
 
 		/**
+		 * Validates the given value. Note that {@code null} is always a valid
+		 * value!
+		 *
+		 * @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
+		 */
+		public boolean validate(T value);
+
+		/**
 		 * Sets the current value of the option.
 		 *
 		 * @param value
 		 *            The new value of the option
+		 * @throws IllegalArgumentException
+		 *             if the value is not valid for this option
 		 */
-		public void set(T value);
+		public void set(T value) throws IllegalArgumentException;
 
 	}
 
@@ -113,6 +129,9 @@ public class Options {
 		/** The current value. */
 		private volatile T value;
 
+		/** The validator. */
+		private Validator<T> validator;
+
 		/** The option watcher. */
 		private final List<OptionWatcher<T>> optionWatchers = new ArrayList<OptionWatcher<T>>();
 
@@ -125,7 +144,22 @@ public class Options {
 		 *            The option watchers
 		 */
 		public DefaultOption(T defaultValue, OptionWatcher<T>... optionWatchers) {
+			this(defaultValue, null, optionWatchers);
+		}
+
+		/**
+		 * Creates a new default option.
+		 *
+		 * @param defaultValue
+		 *            The default value of the option
+		 * @param validator
+		 *            The validator for value validation
+		 * @param optionWatchers
+		 *            The option watchers
+		 */
+		public DefaultOption(T defaultValue, Validator<T> validator, OptionWatcher<T>... optionWatchers) {
 			this.defaultValue = defaultValue;
+			this.validator = validator;
 			this.optionWatchers.addAll(Arrays.asList(optionWatchers));
 		}
 
@@ -160,7 +194,18 @@ public class Options {
 		 * {@inheritDoc}
 		 */
 		@Override
+		public boolean validate(@SuppressWarnings("hiding") T value) {
+			return (validator == null) || (value == null) || validator.validate(value);
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
 		public void set(T value) {
+			if ((value != null) && (validator != null) && (!validator.validate(value))) {
+				throw new IllegalArgumentException("New Value (" + value + ") could not be validated.");
+			}
 			T oldValue = this.value;
 			this.value = value;
 			if (!get().equals(oldValue)) {