PrefService: eliminate get/putIterable methods

These have now been combined with the get/putList methods:

* The putList method accepts any iterable.
* Any persisted Iterable is retrievable as a List with getList.

Previously, it might have broken backwards compatibility for
the putList(Class, List, String) signature to be widened to
putList(Class, Iterable, String). But since we deprecated
that method in favor of a new and as-yet-unreleased method
put(Class, String, List), we can widen it to
put(Class, String, Iterable) without guilt.

Author: ctrueden

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

@@ -154,7 +154,7 @@ public void put(final Class<?> c, final String name,
 
 	@Override
 	public void put(final Class<?> c, final String name,
-		final List<String> value)
+		final Iterable<String> value)
 	{
 		prefs(c).node(key(c, name)).putList(value);
 	}
@@ -225,15 +225,10 @@ 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 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);
+		put(prefClass, name, iterable);
 	}
 
 	// -- Deprecated methods --
@@ -486,13 +481,14 @@ public Map<String, String> getMap() {
 			return map;
 		}
 
-		public void putList(final List<String> list) {
-			for (int index = 0; list != null && index < list.size(); index++) {
-				final Object value = list.get(index);
-				put("" + index, value);
+		public void putList(final Iterable<String> list) {
+			int index = 0;
+			for (final String value : list) {
+				put("" + index++, value);
 			}
 		}
 
+
 		public List<String> getList() {
 			final List<String> list = new ArrayList<>();
 			for (int index = 0; index < Integer.MAX_VALUE; index++) {
@@ -503,13 +499,6 @@ public List<String> getList() {
 			return list;
 		}
 
-		public void putIterable(final Iterable<String> iterable) {
-			int index = 0;
-			for (final String value : iterable) {
-				put("" + index++, value);
-			}
-		}
-
 		public Iterable<String> getIterable() {
 			return new Iterable<String>() {
 				@Override

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

@@ -77,7 +77,7 @@ public interface PrefService extends SciJavaService {
 
 	void put(Class<?> c, String name, Map<String, String> value);
 
-	void put(Class<?> c, String name, List<String> list);
+	void put(Class<?> c, String name, Iterable<String> list);
 
 	void clear(Class<?> c);
 
@@ -125,11 +125,6 @@ public interface PrefService extends SciJavaService {
 	@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.
 	 */

src/test/java/org/scijava/prefs/PrefServiceTest.java

@@ -160,7 +160,7 @@ public void testMap() {
 	}
 
 	/**
-	 * Tests {@link PrefService#put(Class, String, List)} and
+	 * Tests {@link PrefService#put(Class, String, Iterable)} and
 	 * {@link PrefService#getList(Class, String)}.
 	 */
 	@Test