Change all copyright headers to include 2012.

[Sone.git] / src / main / java / net / pterodactylus / sone / core / Options.java

diff --git a/src/main/java/net/pterodactylus/sone/core/Options.java b/src/main/java/net/pterodactylus/sone/core/Options.java
index 1bdf21f..af81d0f 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/Options.java
+++ b/src/main/java/net/pterodactylus/sone/core/Options.java
@@ -1,5 +1,5 @@
 /*
- * Sone - Options.java - Copyright © 2010 David Roden
+ * Sone - Options.java - Copyright © 2010–2012 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
@@ -17,11 +17,8 @@
 
 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;
@@ -133,7 +130,29 @@ public class Options {
                private Validator<T> validator;
 
                /** The option watcher. */
-               private final List<OptionWatcher<T>> optionWatchers = new ArrayList<OptionWatcher<T>>();
+               private final OptionWatcher<T> optionWatcher;
+
+               /**
+                * Creates a new default option.
+                *
+                * @param defaultValue
+                *            The default value of the option
+                */
+               public DefaultOption(T defaultValue) {
+                       this(defaultValue, (OptionWatcher<T>) null);
+               }
+
+               /**
+                * Creates a new default option.
+                *
+                * @param defaultValue
+                *            The default value of the option
+                * @param validator
+                *            The validator for value validation (may be {@code null})
+                */
+               public DefaultOption(T defaultValue, Validator<T> validator) {
+                       this(defaultValue, validator, null);
+               }
 
                /**
                 * Creates a new default option.
@@ -141,9 +160,9 @@ public class Options {
                 * @param defaultValue
                 *            The default value of the option
                 * @param optionWatchers
-                *            The option watchers
+                *            The option watchers (may be {@code null})
                 */
-               public DefaultOption(T defaultValue, OptionWatcher<T>... optionWatchers) {
+               public DefaultOption(T defaultValue, OptionWatcher<T> optionWatchers) {
                        this(defaultValue, null, optionWatchers);
                }
 
@@ -153,14 +172,14 @@ public class Options {
                 * @param defaultValue
                 *            The default value of the option
                 * @param validator
-                *            The validator for value validation
-                * @param optionWatchers
-                *            The option watchers
+                *            The validator for value validation (may be {@code null})
+                * @param optionWatcher
+                *            The option watcher (may be {@code null})
                 */
-               public DefaultOption(T defaultValue, Validator<T> validator, OptionWatcher<T>... optionWatchers) {
+               public DefaultOption(T defaultValue, Validator<T> validator, OptionWatcher<T> optionWatcher) {
                        this.defaultValue = defaultValue;
                        this.validator = validator;
-                       this.optionWatchers.addAll(Arrays.asList(optionWatchers));
+                       this.optionWatcher = optionWatcher;
                }
 
                /**
@@ -209,7 +228,7 @@ public class Options {
                        T oldValue = this.value;
                        this.value = value;
                        if (!get().equals(oldValue)) {
-                               for (OptionWatcher<T> optionWatcher : optionWatchers) {
+                               if (optionWatcher != null) {
                                        optionWatcher.optionChanged(this, oldValue, get());
                                }
                        }
@@ -226,6 +245,9 @@ public class Options {
        /** Holds all {@link String} {@link Option}s. */
        private final Map<String, Option<String>> stringOptions = Collections.synchronizedMap(new HashMap<String, Option<String>>());
 
+       /** Holds all {@link Enum} {@link Option}s. */
+       private final Map<String, Option<? extends Enum<?>>> enumOptions = Collections.synchronizedMap(new HashMap<String, Option<? extends Enum<?>>>());
+
        /**
         * Adds a boolean option.
         *
@@ -304,4 +326,38 @@ public class Options {
                return stringOptions.get(name);
        }
 
+       /**
+        * Adds an {@link Enum} {@link Option}.
+        *
+        * @param name
+        *            The name of the option
+        * @param enumOption
+        *            The option
+        * @return The given option
+        */
+       public <T extends Enum<T>> Option<T> addEnumOption(String name, Option<T> enumOption) {
+               enumOptions.put(name, enumOption);
+               return enumOption;
+       }
+
+       /**
+        * Returns a {@link Enum} {@link Option}. As the type can probably not be
+        * interred correctly you could help the compiler by calling this method
+        * like this:
+        * <p>
+        *
+        * <pre>
+        * options.&lt;SomeEnum&gt; getEnumOption(&quot;SomeEnumOption&quot;).get();
+        * </pre>
+        *
+        * @param name
+        *            The name of the option
+        * @return The enum option, or {@code null} if there is no enum option with
+        *         the given name
+        */
+       @SuppressWarnings("unchecked")
+       public <T extends Enum<T>> Option<T> getEnumOption(String name) {
+               return (Option<T>) enumOptions.get(name);
+       }
+
 }