Correct conversion service naming converntions

* package is now org.scijava.convert. Shouldn't have been a subpackage
  of *.util.
* ConversionHandler is now just a Converter, to imply action.
* ConversionService is now just ConvertService.

Author: hinerm

…onversion/AbstractConversionService.java …java/convert/AbstractConvertService.javasrc/main/java/org/scijava/util/conversion/AbstractConversionService.java renamed to src/main/java/org/scijava/convert/AbstractConvertService.java src/main/java/org/scijava/util/conversion/AbstractConversionService.java renamed to src/main/java/org/scijava/convert/AbstractConvertService.java

@@ -29,22 +29,22 @@
  * #L%
  */
 
-package org.scijava.util.conversion;
+package org.scijava.convert;
 
 import java.lang.reflect.Type;
 
 import org.scijava.plugin.AbstractHandlerService;
 import org.scijava.util.ConversionUtils;
 
 /**
- * Abstract superclass for {@link ConversionService} implementations. Sets
+ * Abstract superclass for {@link ConvertService} implementations. Sets
  * this service as the active delegate service in {@link ConversionUtils}.
  *
  * @author Mark Hiner
  */
-public abstract class AbstractConversionService extends
-	AbstractHandlerService<ConversionRequest, ConversionHandler> implements
-	ConversionService
+public abstract class AbstractConvertService extends
+	AbstractHandlerService<ConversionRequest, Converter> implements
+	ConvertService
 {
 
 	// -- ConversionService methods --
@@ -58,13 +58,13 @@ public Object convert(Object src, Type dest) {
 	public <T> T convert(Object src, Class<T> dest) {
 		// NB: repeated code with convert(ConversionRequest), because the
 		// handler's convert method respects the T provided
-		ConversionHandler handler = getHandler(src, dest);
+		Converter handler = getHandler(src, dest);
 		return handler == null ? null : handler.convert(src, dest);
 	}
 
 	@Override
 	public Object convert(ConversionRequest request) {
-		ConversionHandler handler = getHandler(request);
+		Converter handler = getHandler(request);
 		return handler == null ? null : handler.convert(request);
 	}
 

…onversion/AbstractConversionHandler.java …g/scijava/convert/AbstractConverter.javasrc/main/java/org/scijava/util/conversion/AbstractConversionHandler.java renamed to src/main/java/org/scijava/convert/AbstractConverter.java src/main/java/org/scijava/util/conversion/AbstractConversionHandler.java renamed to src/main/java/org/scijava/convert/AbstractConverter.java

@@ -29,12 +29,12 @@
  * #L%
  */
 
-package org.scijava.util.conversion;
+package org.scijava.convert;
 
 import org.scijava.plugin.AbstractHandlerPlugin;
 
 /**
- * Abstract superclass for {@link ConversionHandler} plugins. Performs
+ * Abstract superclass for {@link Converter} plugins. Performs
  * appropriate dispatching of {@link #canConvert(ConversionRequest)} and
  * {@link #convert(ConversionRequest)} calls based on the actual state of the
  * given {@link ConversionRequest}.
@@ -45,8 +45,8 @@
  *
  * @author Mark Hiner
  */
-public abstract class AbstractConversionHandler extends
-	AbstractHandlerPlugin<ConversionRequest> implements ConversionHandler
+public abstract class AbstractConverter extends
+	AbstractHandlerPlugin<ConversionRequest> implements Converter
 {
 
 	// -- ConversionHandler methods --

…a/util/conversion/ConversionRequest.java …g/scijava/convert/ConversionRequest.javasrc/main/java/org/scijava/util/conversion/ConversionRequest.java renamed to src/main/java/org/scijava/convert/ConversionRequest.java src/main/java/org/scijava/util/conversion/ConversionRequest.java renamed to src/main/java/org/scijava/convert/ConversionRequest.java

@@ -29,28 +29,28 @@
  * #L%
  */
 
-package org.scijava.util.conversion;
+package org.scijava.convert;
 
 import java.lang.reflect.Type;
 
 /**
- * Currency for use in {@link ConversionHandler} and {@link ConversionService}
+ * Currency for use in {@link Converter} and {@link ConvertService}
  * methods.
  * <p>
  * {@link #ConversionRequest} provides a variety of constructors. Note that only
  * one destination type needs to be set (e.g. either a {@link Type} or a
  * {@link Class}).
  * </p>
  * <p>
- * Only the {@link Class} source needs to be set for {@link ConversionHandler}
+ * Only the {@link Class} source needs to be set for {@link Converter}
  * lookup, such as through
- * {@link ConversionService#getHandler(ConversionRequest)}. However, to perform
+ * {@link ConvertService#getHandler(ConversionRequest)}. However, to perform
  * an actual conversion, e.g. using
- * {@link ConversionHandler#convert(ConversionRequest)}, you must provide an
+ * {@link Converter#convert(ConversionRequest)}, you must provide an
  * {@link Object} source.
  * </p>
  * <p>
- * NB: once a {@link ConversionHandler} has been acquired, the
+ * NB: once a {@link Converter} has been acquired, the
  * {@code ConversionRequest} used for lookup can be reused to cast to the same
  * destination type, simply by updating the source object using the
  * {@link #setSourceObject(Object)} method.

…a/util/conversion/ConversionService.java …/org/scijava/convert/ConvertService.javasrc/main/java/org/scijava/util/conversion/ConversionService.java renamed to src/main/java/org/scijava/convert/ConvertService.java src/main/java/org/scijava/util/conversion/ConversionService.java renamed to src/main/java/org/scijava/convert/ConvertService.java

@@ -29,58 +29,58 @@
  * #L%
  */
 
-package org.scijava.util.conversion;
+package org.scijava.convert;
 
 import java.lang.reflect.Type;
 
 import org.scijava.plugin.HandlerService;
 
 /**
  * Service for converting between types using an extensible plugin:
- * {@link ConversionHandler}. Contains convenience signatures for the
+ * {@link Converter}. Contains convenience signatures for the
  * {@link #getHandler} and {@link #supports} methods to avoid the need to create
  * {@link ConversionRequest} objects.
  *
  * @see ConversionRequest
  * @author Mark Hiner
  */
-public interface ConversionService extends
-	HandlerService<ConversionRequest, ConversionHandler>
+public interface ConvertService extends
+	HandlerService<ConversionRequest, Converter>
 {
 	/**
-	 * @see ConversionHandler#convert(Object, Type)
+	 * @see Converter#convert(Object, Type)
 	 */
 	Object convert(Object src, Type dest);
 
 	/**
-	 * @see ConversionHandler#convert(Object, Class)
+	 * @see Converter#convert(Object, Class)
 	 */
 	<T> T convert(Object src, Class<T> dest);
 
 	/**
-	 * @see ConversionHandler#convert(ConversionRequest)
+	 * @see Converter#convert(ConversionRequest)
 	 */
 	Object convert(ConversionRequest request);
 
 	/**
 	 * @see #getHandler(ConversionRequest)
 	 */
-	ConversionHandler getHandler(Object src, Class<?> dest);
+	Converter getHandler(Object src, Class<?> dest);
 
 	/**
 	 * @see #getHandler(ConversionRequest)
 	 */
-	ConversionHandler getHandler(Class<?> src, Class<?> dest);
+	Converter getHandler(Class<?> src, Class<?> dest);
 
 	/**
 	 * @see #getHandler(ConversionRequest)
 	 */
-	ConversionHandler getHandler(Object src, Type dest);
+	Converter getHandler(Object src, Type dest);
 
 	/**
 	 * @see #getHandler(ConversionRequest)
 	 */
-	ConversionHandler getHandler(Class<?> src, Type dest);
+	Converter getHandler(Class<?> src, Type dest);
 
 	/**
 	 * @see #supports(ConversionRequest)

…a/util/conversion/ConversionHandler.java …/java/org/scijava/convert/Converter.javasrc/main/java/org/scijava/util/conversion/ConversionHandler.java renamed to src/main/java/org/scijava/convert/Converter.java src/main/java/org/scijava/util/conversion/ConversionHandler.java renamed to src/main/java/org/scijava/convert/Converter.java

@@ -29,7 +29,7 @@
  * #L%
  */
 
-package org.scijava.util.conversion;
+package org.scijava.convert;
 
 import java.lang.reflect.Type;
 import java.util.Collection;
@@ -46,7 +46,7 @@
  * @see ConversionRequest
  * @author Mark Hiner
  */
-public interface ConversionHandler extends HandlerPlugin<ConversionRequest> {
+public interface Converter extends HandlerPlugin<ConversionRequest> {
 
 	/**
 	 * Checks whether a given {@ConversionRequest} can be

…conversion/DefaultConversionService.java …ijava/convert/DefaultConvertService.javasrc/main/java/org/scijava/util/conversion/DefaultConversionService.java renamed to src/main/java/org/scijava/convert/DefaultConvertService.java src/main/java/org/scijava/util/conversion/DefaultConversionService.java renamed to src/main/java/org/scijava/convert/DefaultConvertService.java

@@ -29,25 +29,25 @@
  * #L%
  */
 
-package org.scijava.util.conversion;
+package org.scijava.convert;
 
 import java.lang.reflect.Type;
 
 import org.scijava.plugin.Plugin;
 import org.scijava.service.Service;
 
 /**
- * Default {@link ConversionService} implementation.
+ * Default {@link ConvertService} implementation.
  *
  * @author Mark Hiner
  */
 @Plugin(type = Service.class)
-public class DefaultConversionService extends AbstractConversionService
+public class DefaultConvertService extends AbstractConvertService
 {
 
 	@Override
-	public Class<ConversionHandler> getPluginType() {
-		return ConversionHandler.class;
+	public Class<Converter> getPluginType() {
+		return Converter.class;
 	}
 
 	@Override
@@ -58,22 +58,22 @@ public Class<ConversionRequest> getType() {
 	// -- ConversionService methods --
 
 	@Override
-	public ConversionHandler getHandler(final Object src, final Class<?> dest) {
+	public Converter getHandler(final Object src, final Class<?> dest) {
 		return getHandler(new ConversionRequest(src, dest));
 	}
 
 	@Override
-	public ConversionHandler getHandler(final Class<?> src, final Class<?> dest) {
+	public Converter getHandler(final Class<?> src, final Class<?> dest) {
 		return getHandler(new ConversionRequest(src, dest));
 	}
 
 	@Override
-	public ConversionHandler getHandler(final Object src, final Type dest) {
+	public Converter getHandler(final Object src, final Type dest) {
 		return getHandler(new ConversionRequest(src, dest));
 	}
 
 	@Override
-	public ConversionHandler getHandler(final Class<?> src, final Type dest) {
+	public Converter getHandler(final Class<?> src, final Type dest) {
 		return getHandler(new ConversionRequest(src, dest));
 	}
 

…conversion/DefaultConversionHandler.java …rg/scijava/convert/DefaultConverter.javasrc/main/java/org/scijava/util/conversion/DefaultConversionHandler.java renamed to src/main/java/org/scijava/convert/DefaultConverter.java src/main/java/org/scijava/util/conversion/DefaultConversionHandler.java renamed to src/main/java/org/scijava/convert/DefaultConverter.java

@@ -29,7 +29,7 @@
  * #L%
  */
 
-package org.scijava.util.conversion;
+package org.scijava.convert;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
@@ -49,13 +49,13 @@
 import org.scijava.util.GenericUtils;
 
 /**
- * Default {@link ConversionHandler} implementation. Provides useful conversion
+ * Default {@link Converter} implementation. Provides useful conversion
  * functionality for many common conversion cases.
  *
  * @author Mark Hiner
  */
-@Plugin(type = ConversionHandler.class)
-public class DefaultConversionHandler extends AbstractConversionHandler {
+@Plugin(type = Converter.class)
+public class DefaultConverter extends AbstractConverter {
 
 	// -- ConversionHandler methods --
 

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

@@ -41,6 +41,7 @@
 
 import org.scijava.MenuPath;
 import org.scijava.Priority;
+import org.scijava.convert.ConvertService;
 import org.scijava.event.EventService;
 import org.scijava.input.Accelerator;
 import org.scijava.log.LogService;
@@ -59,7 +60,6 @@
 import org.scijava.service.Service;
 import org.scijava.thread.ThreadService;
 import org.scijava.util.ClassUtils;
-import org.scijava.util.conversion.ConversionService;
 
 /**
  * Default service for keeping track of and executing available modules.
@@ -92,7 +92,7 @@ public class DefaultModuleService extends AbstractService implements
 	private PrefService prefService;
 
 	@Parameter
-	private ConversionService conversionService;
+	private ConvertService conversionService;
 
 	/** Index of registered modules. */
 	private ModuleIndex moduleIndex;

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

@@ -31,13 +31,13 @@
 
 package org.scijava.module.process;
 
+import org.scijava.convert.ConvertService;
 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.util.conversion.ConversionService;
 import org.scijava.widget.InputHarvester;
 
 /**
@@ -59,7 +59,7 @@ public class LoadInputsPreprocessor extends AbstractPreprocessorPlugin {
 	private ModuleService moduleService;
 
 	@Parameter
-	private ConversionService conversionService;
+	private ConvertService conversionService;
 
 	// -- ModuleProcessor methods --
 

src/main/java/org/scijava/script/ScriptInfo.java

@@ -49,14 +49,14 @@
 import org.scijava.ItemVisibility;
 import org.scijava.NullContextException;
 import org.scijava.command.Command;
+import org.scijava.convert.ConvertService;
 import org.scijava.log.LogService;
 import org.scijava.module.AbstractModuleInfo;
 import org.scijava.module.DefaultMutableModuleItem;
 import org.scijava.module.ModuleException;
 import org.scijava.plugin.Parameter;
 import org.scijava.util.DigestUtils;
 import org.scijava.util.FileUtils;
-import org.scijava.util.conversion.ConversionService;
 
 /**
  * Metadata about a script.
@@ -85,7 +85,7 @@ public class ScriptInfo extends AbstractModuleInfo implements Contextual {
 	private ScriptService scriptService;
 
 	@Parameter
-	private ConversionService conversionService;
+	private ConvertService conversionService;
 
 	/**
 	 * Creates a script metadata object which describes the given script file.