PrefService: make String arg always name, not key

Passing a raw key is never what we want. The name needs to be
synthesized with the class name. Otherwise the raw key is stored in the
_package_ node, and not actually associated with the specified class.

This is a quasi-breaking change, in that certain kinds of persisted
preferences from previous will be lost. But the behavior was confusing
and inconsistent and problematic as it was, and needed to be fixed.

Author: ctrueden

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

@@ -147,20 +147,20 @@ public void clearAll() {
 	}
 
 	@Override
-	public void clear(final Class<?> prefClass, final String key) {
-		prefs(prefClass).clear(key);
+	public void clear(final Class<?> prefClass, final String name) {
+		prefs(prefClass).clear(key(prefClass, name));
 	}
 
 	@Override
-	public void remove(final Class<?> prefClass, final String key) {
-		prefs(prefClass).remove(key);
+	public void remove(final Class<?> prefClass, final String name) {
+		prefs(prefClass).remove(key(prefClass, name));
 	}
 
 	@Override
 	public void putMap(final Class<?> prefClass, final Map<String, String> map,
-		final String key)
+		final String name)
 	{
-		prefs(prefClass).node(key).putMap(map);
+		prefs(prefClass).node(key(prefClass, name)).putMap(map);
 	}
 
 	@Override
@@ -169,9 +169,9 @@ public void putMap(final Class<?> prefClass, final Map<String, String> map) {
 	}
 
 	@Override
-	public Map<String, String> getMap(final Class<?> prefClass, final String key)
+	public Map<String, String> getMap(final Class<?> prefClass, final String name)
 	{
-		return prefs(prefClass).node(key).getMap();
+		return prefs(prefClass).node(key(prefClass, name)).getMap();
 	}
 
 	@Override
@@ -181,9 +181,9 @@ public Map<String, String> getMap(final Class<?> prefClass) {
 
 	@Override
 	public void putList(final Class<?> prefClass, final List<String> list,
-		final String key)
+		final String name)
 	{
-		prefs(prefClass).node(key).putList(list);
+		prefs(prefClass).node(key(prefClass, name)).putList(list);
 	}
 
 	@Override
@@ -192,8 +192,8 @@ public void putList(final Class<?> prefClass, final List<String> list) {
 	}
 
 	@Override
-	public List<String> getList(final Class<?> prefClass, final String key) {
-		return prefs(prefClass).node(key).getList();
+	public List<String> getList(final Class<?> prefClass, final String name) {
+		return prefs(prefClass).node(key(prefClass, name)).getList();
 	}
 
 	@Override
@@ -202,13 +202,13 @@ public List<String> getList(final Class<?> prefClass) {
 	}
 
 	@Override
-	public Iterable<String> getIterable(final Class<?> prefClass, final String key) {
-		return prefs(prefClass).node(key).getIterable();
+	public Iterable<String> getIterable(final Class<?> prefClass, final String name) {
+		return prefs(prefClass).node(key(prefClass, name)).getIterable();
 	}
 
 	@Override
-	public void putIterable(final Class<?> prefClass, final Iterable<String> iterable, final String key) {
-		prefs(prefClass).node(key).node(key).putIterable(iterable);
+	public void putIterable(final Class<?> prefClass, final Iterable<String> iterable, final String name) {
+		prefs(prefClass).node(key(prefClass, name)).putIterable(iterable);
 	}
 
 	// -- Deprecated methods --

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

@@ -79,15 +79,15 @@ public interface PrefService extends SciJavaService {
 	/**
 	 * Clears the node indexed under the given class.
 	 */
-	void clear(Class<?> prefClass, String key);
+	void clear(Class<?> prefClass, String name);
 
 	/** Removes the node. */
-	void remove(Class<?> prefClass, String key);
+	void remove(Class<?> prefClass, String name);
 
 	/**
 	 * Puts a Map into the preferences, indexed under the specified class.
 	 */
-	void putMap(Class<?> prefClass, Map<String, String> map, String key);
+	void putMap(Class<?> prefClass, Map<String, String> map, String name);
 
 	/**
 	 * Puts a Map into the preferences, indexed under the given class.
@@ -97,23 +97,23 @@ public interface PrefService extends SciJavaService {
 	/**
 	 * Gets a map from the preferences, indexed under the specified class.
 	 */
-	Map<String, String> getMap(Class<?> prefClass, String key);
+	Map<String, String> getMap(Class<?> prefClass, String name);
 
 	/** Gets a Map from the preferences. */
 	Map<String, String> getMap(Class<?> prefClass);
 
 	/**
 	 * Puts a list into the preferences, indexed under the specified class.
 	 */
-	void putList(Class<?> prefClass, List<String> list, String key);
+	void putList(Class<?> prefClass, List<String> list, String name);
 
 	/** Puts a list into the preferences. */
 	void putList(Class<?> prefClass, List<String> list);
 
 	/**
 	 * Gets a List from the preferences, indexed under the specified class.
 	 */
-	List<String> getList(Class<?> prefClass, String key);
+	List<String> getList(Class<?> prefClass, String name);
 
 	/**
 	 * Gets a List from the preferences. Returns an empty list if nothing in
@@ -124,12 +124,12 @@ public interface PrefService extends SciJavaService {
 	/**
 	 * Puts an iterable into the preferences.
 	 */
-	void putIterable(Class<?> prefClass, Iterable<String> iterable, String key);
+	void putIterable(Class<?> prefClass, Iterable<String> iterable, String name);
 
 	/**
 	 * Gets an iterable from the preferences.
 	 */
-	Iterable<String> getIterable(Class<?> prefClass, String key);
+	Iterable<String> getIterable(Class<?> prefClass, String name);
 
 	// -- Deprecated methods --