PrefService: deprecate bad map/list/iterable sigs

Pattern should always be get(class, name) and set(class, name, value).

The methods not conforming to this pattern are now deprecated.

Author: ctrueden

src/main/java/org/scijava/prefs/DefaultPrefService.java

@@ -105,6 +105,16 @@ public long getLong(final Class<?> c, final String name,
 		return prefs(c).getLong(key(c, name), defaultValue);
 	}
 
+	@Override
+	public Map<String, String> getMap(final Class<?> c, final String name) {
+		return prefs(c).node(key(c, name)).getMap();
+	}
+
+	@Override
+	public List<String> getList(final Class<?> c, final String name) {
+		return prefs(c).node(key(c, name)).getList();
+	}
+
 	@Override
 	public void put(final Class<?> c, final String name, final String value) {
 		prefs(c).put(key(c, name), value);
@@ -135,6 +145,20 @@ public void put(final Class<?> c, final String name, final long value) {
 		prefs(c).putLong(key(c, name), value);
 	}
 
+	@Override
+	public void put(final Class<?> c, final String name,
+		final Map<String, String> value)
+	{
+		prefs(c).node(key(c, name)).putMap(value);
+	}
+
+	@Override
+	public void put(final Class<?> c, final String name,
+		final List<String> value)
+	{
+		prefs(c).node(key(c, name)).putList(value);
+	}
+
 	@Override
 	public void clear(final Class<?> c) {
 		prefs(c).clear();
@@ -156,46 +180,41 @@ public void remove(final Class<?> prefClass, final String name) {
 		prefs(prefClass).remove(key(prefClass, name));
 	}
 
+	@Deprecated
 	@Override
 	public void putMap(final Class<?> prefClass, final Map<String, String> map,
 		final String name)
 	{
-		prefs(prefClass).node(key(prefClass, name)).putMap(map);
+		put(prefClass, name, map);
 	}
 
+	@Deprecated
 	@Override
 	public void putMap(final Class<?> prefClass, final Map<String, String> map) {
 		prefs(prefClass).putMap(map);
 	}
 
-	@Override
-	public Map<String, String> getMap(final Class<?> prefClass, final String name)
-	{
-		return prefs(prefClass).node(key(prefClass, name)).getMap();
-	}
-
+	@Deprecated
 	@Override
 	public Map<String, String> getMap(final Class<?> prefClass) {
 		return prefs(prefClass).getMap();
 	}
 
+	@Deprecated
 	@Override
 	public void putList(final Class<?> prefClass, final List<String> list,
 		final String name)
 	{
-		prefs(prefClass).node(key(prefClass, name)).putList(list);
+		put(prefClass, name, list);
 	}
 
+	@Deprecated
 	@Override
 	public void putList(final Class<?> prefClass, final List<String> list) {
 		prefs(prefClass).putList(list);
 	}
 
-	@Override
-	public List<String> getList(final Class<?> prefClass, final String name) {
-		return prefs(prefClass).node(key(prefClass, name)).getList();
-	}
-
+	@Deprecated
 	@Override
 	public List<String> getList(final Class<?> prefClass) {
 		return prefs(prefClass).getList();
@@ -207,10 +226,16 @@ public Iterable<String> getIterable(final Class<?> prefClass, final String name)
 	}
 
 	@Override
-	public void putIterable(final Class<?> prefClass, final Iterable<String> iterable, final String name) {
+	public void putIterable(final Class<?> prefClass, final String name, final Iterable<String> iterable) {
 		prefs(prefClass).node(key(prefClass, name)).putIterable(iterable);
 	}
 
+	@Deprecated
+	@Override
+	public void putIterable(final Class<?> prefClass, final Iterable<String> iterable, final String name) {
+		putIterable(prefClass, name, iterable);
+	}
+
 	// -- Deprecated methods --
 
 	@Deprecated

src/main/java/org/scijava/prefs/PrefService.java

@@ -59,6 +59,10 @@ public interface PrefService extends SciJavaService {
 
 	long getLong(Class<?> c, String name, long defaultValue);
 
+	Map<String, String> getMap(Class<?> c, String name);
+
+	List<String> getList(Class<?> c, String name);
+
 	void put(Class<?> c, String name, String value);
 
 	void put(Class<?> c, String name, boolean value);
@@ -71,6 +75,10 @@ public interface PrefService extends SciJavaService {
 
 	void put(Class<?> c, String name, long value);
 
+	void put(Class<?> c, String name, Map<String, String> value);
+
+	void put(Class<?> c, String name, List<String> list);
+
 	void clear(Class<?> c);
 
 	/** Clears everything. */
@@ -87,48 +95,51 @@ public interface PrefService extends SciJavaService {
 	/**
 	 * Puts a Map into the preferences, indexed under the specified class.
 	 */
+	@Deprecated
 	void putMap(Class<?> prefClass, Map<String, String> map, String name);
 
 	/**
 	 * Puts a Map into the preferences, indexed under the given class.
 	 */
+	@Deprecated
 	void putMap(Class<?> prefClass, Map<String, String> map);
 
-	/**
-	 * Gets a map from the preferences, indexed under the specified class.
-	 */
-	Map<String, String> getMap(Class<?> prefClass, String name);
-
 	/** Gets a Map from the preferences. */
+	@Deprecated
 	Map<String, String> getMap(Class<?> prefClass);
 
 	/**
 	 * Puts a list into the preferences, indexed under the specified class.
 	 */
+	@Deprecated
 	void putList(Class<?> prefClass, List<String> list, String name);
 
 	/** Puts a list into the preferences. */
+	@Deprecated
 	void putList(Class<?> prefClass, List<String> list);
 
-	/**
-	 * Gets a List from the preferences, indexed under the specified class.
-	 */
-	List<String> getList(Class<?> prefClass, String name);
-
 	/**
 	 * Gets a List from the preferences. Returns an empty list if nothing in
 	 * prefs.
 	 */
+	@Deprecated
 	List<String> getList(Class<?> prefClass);
 
 	/**
 	 * Puts an iterable into the preferences.
 	 */
+	void putIterable(Class<?> prefClass, String name, Iterable<String> iterable);
+
+	/**
+	 * Puts an iterable into the preferences.
+	 */
+	@Deprecated
 	void putIterable(Class<?> prefClass, Iterable<String> iterable, String name);
 
 	/**
 	 * Gets an iterable from the preferences.
 	 */
+	@Deprecated
 	Iterable<String> getIterable(Class<?> prefClass, String name);
 
 	// -- Deprecated methods --