X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FOptions.java;h=7392da2dd15f49f8bd2eab121e6ce5a421bedf57;hb=8a43c22e3bfc31de0ae43209275f0311e2f875d5;hp=cbe88c8ecb12fc37b2bce37f38d6ed14099d3380;hpb=365991b0251eec67549e34a70d0b8bdd130de8f4;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 cbe88c8..7392da2 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 .
+ */
+
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 validator;
/** The option watcher. */
private final List> optionWatchers = new ArrayList>();
@@ -107,7 +144,22 @@ public class Options {
* The option watchers
*/
public DefaultOption(T defaultValue, OptionWatcher... 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 validator, OptionWatcher... optionWatchers) {
this.defaultValue = defaultValue;
+ this.validator = validator;
this.optionWatchers.addAll(Arrays.asList(optionWatchers));
}
@@ -141,8 +193,18 @@ public class Options {
/**
* {@inheritDoc}
*/
+ public boolean validate(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)) {
@@ -155,10 +217,13 @@ public class Options {
}
/** Holds all {@link Boolean} {@link Option}s. */
- private final Map> booleanOptions = new HashMap>();
+ private final Map> booleanOptions = Collections.synchronizedMap(new HashMap>());
/** Holds all {@link Integer} {@link Option}s. */
- private final Map> integerOptions = new HashMap>();
+ private final Map> integerOptions = Collections.synchronizedMap(new HashMap>());
+
+ /** Holds all {@link String} {@link Option}s. */
+ private final Map> stringOptions = Collections.synchronizedMap(new HashMap>());
/**
* Adds a boolean option.
@@ -212,4 +277,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 addStringOption(String name, Option 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 getStringOption(String name) {
+ return stringOptions.get(name);
+ }
+
}