X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FOptions.java;h=94fbec1b41ed17d8b95259b421f8337e68fb5b55;hb=c5e641893a2656ebf2c2c8c369fe75eaf3061b52;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..94fbec1 100644
--- a/src/main/java/net/pterodactylus/sone/core/Options.java
+++ b/src/main/java/net/pterodactylus/sone/core/Options.java
@@ -1,7 +1,25 @@
+/*
+ * 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;
@@ -93,7 +111,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>>();
@@ -155,10 +173,13 @@ public class Options {
 	}
 
 	/** Holds all {@link Boolean} {@link Option}s. */
-	private final Map<String, Option<Boolean>> booleanOptions = new HashMap<String, Option<Boolean>>();
+	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.
@@ -212,4 +233,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);
+	}
+
 }