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=752c36c403fdc3fad96219e57f553e249f93f7be;hpb=bc11c5c7ea2d08b5cc3acd62a0af06459997454c;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 752c36c..6a945b9 100644
--- a/src/main/java/net/pterodactylus/sone/core/Options.java
+++ b/src/main/java/net/pterodactylus/sone/core/Options.java
@@ -1,11 +1,31 @@
+/*
+ * Sone - Options.java - Copyright © 2010 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 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;
+
 /**
  * Stores various options that influence Sone’s behaviour.
  *
@@ -46,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;
 
 	}
 
@@ -93,7 +127,10 @@ public class Options {
 		private final T defaultValue;
 
 		/** The current value. */
-		private T value;
+		private volatile T value;
+
+		/** The validator. */
+		private Validator<T> validator;
 
 		/** The option watcher. */
 		private final List<OptionWatcher<T>> optionWatchers = new ArrayList<OptionWatcher<T>>();
@@ -107,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));
 		}
 
@@ -142,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)) {
@@ -154,8 +217,40 @@ public class Options {
 
 	}
 
+	/** Holds all {@link Boolean} {@link Option}s. */
+	private final Map<String, Option<Boolean>> booleanOptions = Collections.synchronizedMap(new HashMap<String, Option<Boolean>>());
+
 	/** Holds all {@link Integer} {@link Option}s. */
-	private final Map<String, Option<Integer>> integerOptions = new HashMap<String, Option<Integer>>();
+	private final Map<String, Option<Integer>> integerOptions = Collections.synchronizedMap(new HashMap<String, Option<Integer>>());
+
+	/** Holds all {@link String} {@link Option}s. */
+	private final Map<String, Option<String>> stringOptions = Collections.synchronizedMap(new HashMap<String, Option<String>>());
+
+	/**
+	 * Adds a boolean option.
+	 *
+	 * @param name
+	 *            The name of the option
+	 * @param booleanOption
+	 *            The option
+	 * @return The given option
+	 */
+	public Option<Boolean> addBooleanOption(String name, Option<Boolean> booleanOption) {
+		booleanOptions.put(name, booleanOption);
+		return booleanOption;
+	}
+
+	/**
+	 * Returns the boolean option with the given name.
+	 *
+	 * @param name
+	 *            The name of the option
+	 * @return The option, or {@code null} if there is no option with the given
+	 *         name
+	 */
+	public Option<Boolean> getBooleanOption(String name) {
+		return booleanOptions.get(name);
+	}
 
 	/**
 	 * Adds an {@link Integer} {@link Option}.
@@ -183,4 +278,30 @@ public class Options {
 		return integerOptions.get(name);
 	}
 
+	/**
+	 * Adds a {@link String} {@link Option}.
+	 *
+	 * @param name
+	 *            The name of the option
+	 * @param stringOption
+	 *            The option
+	 * @return The given option
+	 */
+	public Option<String> addStringOption(String name, Option<String> stringOption) {
+		stringOptions.put(name, stringOption);
+		return stringOption;
+	}
+
+	/**
+	 * Returns a {@link String} {@link Option}.
+	 *
+	 * @param name
+	 *            The name of the string option to get
+	 * @return The string option, or {@code null} if there is no option with the
+	 *         given name
+	 */
+	public Option<String> getStringOption(String name) {
+		return stringOptions.get(name);
+	}
+
 }