X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FOptions.java;h=398374a0468b23fcb5d89f9b0fe38ec45e8b93bb;hp=94fbec1b41ed17d8b95259b421f8337e68fb5b55;hb=64740709990291688170ebd1f192af5eb9090618;hpb=6023bbd61648c16270edb6c59b24f61d648bb982

diff --git a/src/main/java/net/pterodactylus/sone/core/Options.java b/src/main/java/net/pterodactylus/sone/core/Options.java
index 94fbec1..398374a 100644
--- 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–2020 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,161 +17,17 @@
 
 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.sone.utils.Option;
+
 /**
  * Stores various options that influence Sone’s behaviour.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class Options {
 
-	/**
-	 * Contains current and default value of an option.
-	 *
-	 * @param <T>
-	 *            The type of the option
-	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
-	 */
-	public static interface Option<T> {
-
-		/**
-		 * Returns the default value of the option.
-		 *
-		 * @return The default value of the option
-		 */
-		public T getDefault();
-
-		/**
-		 * Returns the current value of the option. If the current value is not
-		 * set (usually {@code null}), the default value is returned.
-		 *
-		 * @return The current value of the option
-		 */
-		public T get();
-
-		/**
-		 * Returns the real value of the option. This will also return an unset
-		 * value (usually {@code null})!
-		 *
-		 * @return The real value of the option
-		 */
-		public T getReal();
-
-		/**
-		 * Sets the current value of the option.
-		 *
-		 * @param value
-		 *            The new value of the option
-		 */
-		public void set(T value);
-
-	}
-
-	/**
-	 * Interface for objects that want to be notified when an option changes its
-	 * value.
-	 *
-	 * @param <T>
-	 *            The type of the option
-	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
-	 */
-	public static interface OptionWatcher<T> {
-
-		/**
-		 * Notifies an object that an option has been changed.
-		 *
-		 * @param option
-		 *            The option that has changed
-		 * @param oldValue
-		 *            The old value of the option
-		 * @param newValue
-		 *            The new value of the option
-		 */
-		public void optionChanged(Option<T> option, T oldValue, T newValue);
-
-	}
-
-	/**
-	 * Basic implementation of an {@link Option} that notifies an
-	 * {@link OptionWatcher} if the value changes.
-	 *
-	 * @param <T>
-	 *            The type of the option
-	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
-	 */
-	public static class DefaultOption<T> implements Option<T> {
-
-		/** The default value. */
-		private final T defaultValue;
-
-		/** The current value. */
-		private volatile T value;
-
-		/** The option watcher. */
-		private final List<OptionWatcher<T>> optionWatchers = new ArrayList<OptionWatcher<T>>();
-
-		/**
-		 * Creates a new default option.
-		 *
-		 * @param defaultValue
-		 *            The default value of the option
-		 * @param optionWatchers
-		 *            The option watchers
-		 */
-		public DefaultOption(T defaultValue, OptionWatcher<T>... optionWatchers) {
-			this.defaultValue = defaultValue;
-			this.optionWatchers.addAll(Arrays.asList(optionWatchers));
-		}
-
-		/**
-		 * {@inheritDoc}
-		 */
-		@Override
-		public T getDefault() {
-			return defaultValue;
-		}
-
-		/**
-		 * {@inheritDoc}
-		 */
-		@Override
-		public T get() {
-			return (value != null) ? value : defaultValue;
-		}
-
-		/**
-		 * Returns the real value of the option. This will also return an unset
-		 * value (usually {@code null})!
-		 *
-		 * @return The real value of the option
-		 */
-		@Override
-		public T getReal() {
-			return value;
-		}
-
-		/**
-		 * {@inheritDoc}
-		 */
-		@Override
-		public void set(T value) {
-			T oldValue = this.value;
-			this.value = value;
-			if (!get().equals(oldValue)) {
-				for (OptionWatcher<T> optionWatcher : optionWatchers) {
-					optionWatcher.optionChanged(this, oldValue, get());
-				}
-			}
-		}
-
-	}
-
 	/** Holds all {@link Boolean} {@link Option}s. */
 	private final Map<String, Option<Boolean>> booleanOptions = Collections.synchronizedMap(new HashMap<String, Option<Boolean>>());
 
@@ -181,6 +37,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.
 	 *
@@ -259,4 +118,42 @@ public class Options {
 		return stringOptions.get(name);
 	}
 
+	/**
+	 * Adds an {@link Enum} {@link Option}.
+	 *
+	 * @param <T>
+	 *            The enum type
+	 * @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 <T>
+	 *            The enum type
+	 * @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);
+	}
+
 }