X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FOptions.java;h=c8e3589d497e686f8d59ecb84536baf8680c9f7d;hb=7cd3aec944cf84236a2fa4991915608d4c905182;hp=1bdf21ffd822f5972b109dfab9f19830c0a375ce;hpb=47ed7eaf00c35889781831d33d04e9f91c9ad266;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 1bdf21f..c8e3589 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.
@@ -71,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);
 
@@ -130,10 +126,32 @@ 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
+		 */
+		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, Predicate<T> validator) {
+			this(defaultValue, validator, null);
+		}
 
 		/**
 		 * Creates a new default option.
@@ -141,9 +159,9 @@ public class Options {
 		 * @param defaultValue
 		 *            The default value of the option
 		 * @param optionWatchers
-		 *            The option watchers
+		 *            The option watchers (may be {@code null})
 		 */
-		public DefaultOption(T defaultValue, OptionWatcher<T>... optionWatchers) {
+		public DefaultOption(T defaultValue, OptionWatcher<T> optionWatchers) {
 			this(defaultValue, null, optionWatchers);
 		}
 
@@ -153,14 +171,14 @@ public class Options {
 		 * @param defaultValue
 		 *            The default value of the option
 		 * @param validator
-		 *            The validator for value validation
-		 * @param optionWatchers
-		 *            The option watchers
+		 *            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>... optionWatchers) {
+		public DefaultOption(T defaultValue, Predicate<T> validator, OptionWatcher<T> optionWatcher) {
 			this.defaultValue = defaultValue;
 			this.validator = validator;
-			this.optionWatchers.addAll(Arrays.asList(optionWatchers));
+			this.optionWatcher = optionWatcher;
 		}
 
 		/**
@@ -195,7 +213,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 +221,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());
 				}
 			}
@@ -226,6 +244,9 @@ public class Options {
 	/** Holds all {@link String} {@link Option}s. */
 	private final Map<String, Option<String>> stringOptions = Collections.synchronizedMap(new HashMap<String, Option<String>>());
 
+	/** Holds all {@link Enum} {@link Option}s. */
+	private final Map<String, Option<? extends Enum<?>>> enumOptions = Collections.synchronizedMap(new HashMap<String, Option<? extends Enum<?>>>());
+
 	/**
 	 * Adds a boolean option.
 	 *
@@ -304,4 +325,42 @@ public class Options {
 		return stringOptions.get(name);
 	}
 
+	/**
+	 * Adds an {@link Enum} {@link Option}.
+	 *
+	 * @param <T>
+	 *            The enum type
+	 * @param name
+	 *            The name of the option
+	 * @param enumOption
+	 *            The option
+	 * @return The given option
+	 */
+	public <T extends Enum<T>> Option<T> addEnumOption(String name, Option<T> enumOption) {
+		enumOptions.put(name, enumOption);
+		return enumOption;
+	}
+
+	/**
+	 * Returns a {@link Enum} {@link Option}. As the type can probably not be
+	 * interred correctly you could help the compiler by calling this method
+	 * like this:
+	 * <p>
+	 *
+	 * <pre>
+	 * 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);
+	}
+
 }