Refactor for ModuleService saving and loading

Updated classes that were using ModuleItem#saveValue and
ModuleItem#loadValue to use the appropriate ModuleService methods.

Author: hinerm

src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java

@@ -33,6 +33,8 @@
 
 import org.scijava.module.Module;
 import org.scijava.module.ModuleItem;
+import org.scijava.module.ModuleService;
+import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.ConversionUtils;
 import org.scijava.widget.InputHarvester;
@@ -52,6 +54,9 @@
 	priority = InputHarvester.PRIORITY + 1)
 public class LoadInputsPreprocessor extends AbstractPreprocessorPlugin {
 
+	@Parameter
+	private ModuleService moduleService;
+
 	// -- ModuleProcessor methods --
 
 	@Override
@@ -69,9 +74,9 @@ private <T> void loadValue(final Module module, final ModuleItem<T> item) {
 		// skip input that has already been resolved
 		if (module.isResolved(item.getName())) return;
 
+		final T prefValue = moduleService.load(item);
 		final Class<T> type = item.getType();
 		final T defaultValue = item.getValue(module);
-		final T prefValue = item.loadValue();
 		final T value = getBestValue(prefValue, defaultValue, type);
 		item.setValue(module, value);
 	}

src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java

@@ -34,6 +34,8 @@
 import org.scijava.Priority;
 import org.scijava.module.Module;
 import org.scijava.module.ModuleItem;
+import org.scijava.module.ModuleService;
+import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
@@ -51,6 +53,9 @@
 	priority = Priority.VERY_LOW_PRIORITY - 1)
 public class SaveInputsPreprocessor extends AbstractPreprocessorPlugin {
 
+	@Parameter
+	private ModuleService moduleService;
+
 	// -- ModuleProcessor methods --
 
 	@Override
@@ -66,7 +71,7 @@ public void process(final Module module) {
 	/** Saves the value of the given module item to persistent storage. */
 	private <T> void saveValue(final Module module, final ModuleItem<T> item) {
 		final T value = item.getValue(module);
-		item.saveValue(value);
+		moduleService.save(item, value);
 	}
 
 }

src/main/java/org/scijava/options/OptionsPlugin.java

@@ -34,6 +34,7 @@
 import org.scijava.command.DynamicCommand;
 import org.scijava.event.EventService;
 import org.scijava.module.ModuleItem;
+import org.scijava.module.ModuleService;
 import org.scijava.options.event.OptionsEvent;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.SingletonPlugin;
@@ -80,6 +81,9 @@ public class OptionsPlugin extends DynamicCommand implements SingletonPlugin {
 	@Parameter
 	private PrefService prefService;
 
+	@Parameter
+	private ModuleService moduleService;
+
 	// -- OptionsPlugin methods --
 
 	/** Loads option values from persistent storage. */
@@ -119,13 +123,13 @@ public void run() {
 	// -- Helper methods --
 
 	private <T> void loadInput(final ModuleItem<T> input) {
-		final T value = input.loadValue();
+		final T value = moduleService.load(input);
 		if (value != null) input.setValue(this, value);
 	}
 
 	private <T> void saveInput(final ModuleItem<T> input) {
 		final T value = input.getValue(this);
-		input.saveValue(value);
+		moduleService.save(input, value);
 	}
 
 }