DefaultModuleService: get rid of some code smell

The AbstractModuleItem-based case logic should not have been necessary.
Let's use the new ModuleItem#getInfo() method instead.

Author: ctrueden

src/main/java/org/scijava/module/DefaultModuleService.java

@@ -273,14 +273,9 @@ public <T> void save(final ModuleItem<T> item, final T value) {
 
 		final String persistKey = item.getPersistKey();
 		if (persistKey == null || persistKey.isEmpty()) {
-			// Attempt to use prefService
-			if (AbstractModuleItem.class.isAssignableFrom(item.getClass())) {
-				final Class<?> prefClass = ((AbstractModuleItem<T>)item).getDelegateClass();
-				final String prefKey = item.getName();
-				prefService.put(prefClass, prefKey, sValue);
-			}
-			// Have to use ModuleItem#saveValue
-			else item.saveValue(value);
+			final Class<?> prefClass = delegateClass(item);
+			final String prefKey = item.getName();
+			prefService.put(prefClass, prefKey, sValue);
 		}
 		else prefService.put(persistKey, sValue);
 	}
@@ -293,14 +288,9 @@ public <T> T load(final ModuleItem<T> item) {
 		final String sValue;
 		final String persistKey = item.getPersistKey();
 		if (persistKey == null || persistKey.isEmpty()) {
-			// Attempt to use prefService
-			if (AbstractModuleItem.class.isAssignableFrom(item.getClass())) {
-				final Class<?> prefClass = ((AbstractModuleItem<T>)item).getDelegateClass();
-				final String prefKey = item.getName();
-				sValue = prefService.get(prefClass, prefKey);
-			}
-			// Have to use ModuleItem#loadValue
-			else return item.loadValue();
+			final Class<?> prefClass = delegateClass(item);
+			final String prefKey = item.getName();
+			sValue = prefService.get(prefClass, prefKey);
 		}
 		else sValue = prefService.get(persistKey);
 
@@ -438,4 +428,14 @@ private <T> ModuleItem<T> getSingleItem(final Module module,
 		}
 		return result;
 	}
+
+	private <T> Class<?> delegateClass(final ModuleItem<T> item) {
+		try {
+			return item.getInfo().loadDelegateClass();
+		}
+		catch (final ClassNotFoundException exc) {
+			throw new IllegalStateException(exc);
+		}
+	}
+
 }