X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FOptions.java;h=b7ece81fe64b8f87e794979c980eda6c3625e45d;hb=e371dfd08d8b177c097f260f4b1d22b186d8d5b4;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..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> optionWatchers = new ArrayList>(); @@ -155,10 +156,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 +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 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); + } + }