X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FOptions.java;h=d23926d5473863e1f9fe2abbd893c069c639c4b6;hb=2b47186b72e30460a6710f95a76e4a99c305909a;hp=f280aaead58c69498e5b51ca817ee3bf9a234b35;hpb=14dd8f2dcddb3ebfa0618677f10fe11b8f86ecdd;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 f280aae..d23926d 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
@@ -17,14 +17,11 @@
 
 package net.pterodactylus.sone.core;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
-import net.pterodactylus.util.validation.Validator;
+import com.google.common.base.Predicate;
 
 /**
  * Stores various options that influence Sone’s behaviour.
@@ -43,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.
 		 *
@@ -71,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);
 
@@ -130,21 +119,19 @@ public class Options {
 		private volatile T value;
 
 		/** The validator. */
-		private Validator<T> validator;
+		private Predicate<T> validator;
 
 		/** The option watcher. */
-		private final List<OptionWatcher<T>> optionWatchers = new ArrayList<OptionWatcher<T>>();
+		private final OptionWatcher<T> optionWatcher;
 
 		/**
 		 * Creates a new default option.
 		 *
 		 * @param defaultValue
 		 *            The default value of the option
-		 * @param optionWatchers
-		 *            The option watchers
 		 */
-		public DefaultOption(T defaultValue, OptionWatcher<T>... optionWatchers) {
-			this(defaultValue, null, optionWatchers);
+		public DefaultOption(T defaultValue) {
+			this(defaultValue, (OptionWatcher<T>) null);
 		}
 
 		/**
@@ -153,22 +140,38 @@ public class Options {
 		 * @param defaultValue
 		 *            The default value of the option
 		 * @param validator
-		 *            The validator for value validation
+		 *            The validator for value validation (may be {@code null})
+		 */
+		public DefaultOption(T defaultValue, Predicate<T> validator) {
+			this(defaultValue, validator, null);
+		}
+
+		/**
+		 * Creates a new default option.
+		 *
+		 * @param defaultValue
+		 *            The default value of the option
 		 * @param optionWatchers
-		 *            The option watchers
+		 *            The option watchers (may be {@code null})
 		 */
-		public DefaultOption(T defaultValue, Validator<T> validator, OptionWatcher<T>... optionWatchers) {
-			this.defaultValue = defaultValue;
-			this.validator = validator;
-			this.optionWatchers.addAll(Arrays.asList(optionWatchers));
+		public DefaultOption(T defaultValue, OptionWatcher<T> optionWatchers) {
+			this(defaultValue, null, optionWatchers);
 		}
 
 		/**
-		 * {@inheritDoc}
+		 * Creates a new default option.
+		 *
+		 * @param defaultValue
+		 *            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})
 		 */
-		@Override
-		public T getDefault() {
-			return defaultValue;
+		public DefaultOption(T defaultValue, Predicate<T> validator, OptionWatcher<T> optionWatcher) {
+			this.defaultValue = defaultValue;
+			this.validator = validator;
+			this.optionWatcher = optionWatcher;
 		}
 
 		/**
@@ -195,7 +198,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);
 		}
 
 		/**
@@ -203,13 +206,13 @@ 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)) {
-				for (OptionWatcher<T> optionWatcher : optionWatchers) {
+				if (optionWatcher != null) {
 					optionWatcher.optionChanged(this, oldValue, get());
 				}
 			}
@@ -310,6 +313,8 @@ public class Options {
 	/**
 	 * Adds an {@link Enum} {@link Option}.
 	 *
+	 * @param <T>
+	 *            The enum type
 	 * @param name
 	 *            The name of the option
 	 * @param enumOption
@@ -331,11 +336,14 @@ 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
 	 *         the given name
 	 */
+	@SuppressWarnings("unchecked")
 	public <T extends Enum<T>> Option<T> getEnumOption(String name) {
 		return (Option<T>) enumOptions.get(name);
 	}