X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FOptions.java;h=b7ece81fe64b8f87e794979c980eda6c3625e45d;hb=33f333b35a73d3d4a4e79f41e9dd7b342db87b1a;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..b7ece81 100644
--- a/src/main/java/net/pterodactylus/sone/core/Options.java
+++ b/src/main/java/net/pterodactylus/sone/core/Options.java
@@ -2,6 +2,7 @@ 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;
@@ -93,7 +94,7 @@ public class Options {
 		private final T defaultValue;
 
 		/** The current value. */
-		private T value;
+		private volatile T value;
 
 		/** The option watcher. */
 		private final List<OptionWatcher<T>> optionWatchers = new ArrayList<OptionWatcher<T>>();
@@ -154,8 +155,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 +216,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);
+	}
+
 }