Use autogenerated base interfaces

This migrates all the ops to use the autogenerated base interfaces of
net.imagej.ops.Ops, where applicable.

Note that in some cases, there is still an interface with the same name
in its respective package which extends the base interface -- e.g.,
net.imagej.ops.chunker.Chunker extends net.imagej.ops.Ops.Chunker. The
reason is that the base interfaces exist _only_ to provide the NAME and
optional ALIASES, as well as to offer a type-safe anchor for concrete
ops. If you want anything fancier, like an interface that defines
additional methods, and/or uses generic parameters, then it is advised
to define that interface manually in the appropriate package as well.

In other cases, the previous base interface became wholly redundant and
was hence removed in favor of the one in net.imagej.ops.Ops.

src/main/java/net/imagej/ops/DefaultOpService.java

@@ -36,8 +36,6 @@
 import java.util.HashSet;
 import java.util.List;
 
-import net.imagej.ops.create.CreateImg;
-
 import org.scijava.command.CommandInfo;
 import org.scijava.command.CommandService;
 import org.scijava.log.LogService;
@@ -209,7 +207,7 @@ public Object convolve(Object... args) {
 
 	@Override
 	public Object createImg(Object... args) {
-		return run(CreateImg.class, args);
+		return run(Ops.CreateImg.class, args);
 	}
 
 	@Override
@@ -390,7 +388,7 @@ private Object result(final Module module) {
 	@Deprecated
 	@Override
 	public Object create(Object... args) {
-		return run(CreateImg.class, args);
+		return run(Ops.CreateImg.class, args);
 	}
 
 }

src/main/java/net/imagej/ops/arithmetic/add/AddConstantToArrayByteImage.java

@@ -31,6 +31,7 @@
 package net.imagej.ops.arithmetic.add;
 
 import net.imagej.ops.Op;
+import net.imagej.ops.Ops;
 import net.imglib2.img.array.ArrayImg;
 import net.imglib2.img.basictypeaccess.array.ByteArray;
 import net.imglib2.type.numeric.integer.ByteType;
@@ -40,8 +41,8 @@
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 
-@Plugin(type = Op.class, name = Add.NAME, priority = Priority.HIGH_PRIORITY)
-public class AddConstantToArrayByteImage implements Add {
+@Plugin(type = Op.class, name = Ops.Add.NAME, priority = Priority.HIGH_PRIORITY)
+public class AddConstantToArrayByteImage implements Ops.Add {
 
 	@Parameter(type = ItemIO.BOTH)
 	private ArrayImg<ByteType, ByteArray> image;

src/main/java/net/imagej/ops/arithmetic/add/AddConstantToArrayDoubleImage.java

@@ -31,6 +31,7 @@
 package net.imagej.ops.arithmetic.add;
 
 import net.imagej.ops.Op;
+import net.imagej.ops.Ops;
 import net.imglib2.img.array.ArrayImg;
 import net.imglib2.img.basictypeaccess.array.DoubleArray;
 import net.imglib2.type.numeric.real.DoubleType;
@@ -40,8 +41,9 @@
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 
-@Plugin(type = Op.class, name = Add.NAME, priority = Priority.HIGH_PRIORITY + 1)
-public class AddConstantToArrayDoubleImage implements Add {
+@Plugin(type = Op.class, name = Ops.Add.NAME,
+	priority = Priority.HIGH_PRIORITY + 1)
+public class AddConstantToArrayDoubleImage implements Ops.Add {
 
 	@Parameter(type = ItemIO.BOTH)
 	private ArrayImg<DoubleType, DoubleArray> image;

src/main/java/net/imagej/ops/arithmetic/add/AddConstantToImageFunctional.java

@@ -32,6 +32,7 @@
 
 import net.imagej.ops.AbstractStrictFunction;
 import net.imagej.ops.Op;
+import net.imagej.ops.Ops;
 import net.imglib2.Cursor;
 import net.imglib2.IterableInterval;
 import net.imglib2.RandomAccess;
@@ -42,10 +43,11 @@
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 
-@Plugin(type = Op.class, name = Add.NAME, priority = Priority.VERY_LOW_PRIORITY)
+@Plugin(type = Op.class, name = Ops.Add.NAME,
+	priority = Priority.VERY_LOW_PRIORITY)
 public class AddConstantToImageFunctional<T extends NumericType<T>> extends
 	AbstractStrictFunction<IterableInterval<T>, RandomAccessibleInterval<T>>
-	implements Add
+	implements Ops.Add
 {
 
 	@Parameter

src/main/java/net/imagej/ops/arithmetic/add/AddConstantToImageInPlace.java

@@ -31,15 +31,17 @@
 package net.imagej.ops.arithmetic.add;
 
 import net.imagej.ops.Op;
+import net.imagej.ops.Ops;
 import net.imglib2.IterableRealInterval;
 import net.imglib2.type.numeric.NumericType;
 
 import org.scijava.ItemIO;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 
-@Plugin(type = Op.class, name = Add.NAME)
-public class AddConstantToImageInPlace<T extends NumericType<T>> implements Add
+@Plugin(type = Op.class, name = Ops.Add.NAME)
+public class AddConstantToImageInPlace<T extends NumericType<T>> implements
+	Ops.Add
 {
 
 	@Parameter(type = ItemIO.BOTH)

src/main/java/net/imagej/ops/arithmetic/add/AddConstantToNumericType.java

@@ -32,15 +32,16 @@
 
 import net.imagej.ops.AbstractOutputFunction;
 import net.imagej.ops.Op;
+import net.imagej.ops.Ops;
 import net.imglib2.type.numeric.NumericType;
 
 import org.scijava.Priority;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 
-@Plugin(type = Op.class, name = Add.NAME, priority = Priority.LOW_PRIORITY)
+@Plugin(type = Op.class, name = Ops.Add.NAME, priority = Priority.LOW_PRIORITY)
 public class AddConstantToNumericType<T extends NumericType<T>> extends
-	AbstractOutputFunction<T, T> implements Add
+	AbstractOutputFunction<T, T> implements Ops.Add
 {
 
 	@Parameter

src/main/java/net/imagej/ops/arithmetic/add/AddConstantToPlanarDoubleImage.java

@@ -31,6 +31,7 @@
 package net.imagej.ops.arithmetic.add;
 
 import net.imagej.ops.Op;
+import net.imagej.ops.Ops;
 import net.imglib2.img.basictypeaccess.array.DoubleArray;
 import net.imglib2.img.planar.PlanarImg;
 import net.imglib2.type.numeric.real.DoubleType;
@@ -39,8 +40,8 @@
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 
-@Plugin(type = Op.class, name = Add.NAME)
-public class AddConstantToPlanarDoubleImage implements Add {
+@Plugin(type = Op.class, name = Ops.Add.NAME)
+public class AddConstantToPlanarDoubleImage implements Ops.Add {
 
 	@Parameter(type = ItemIO.BOTH)
 	private PlanarImg<DoubleType, DoubleArray> image;

src/main/java/net/imagej/ops/arithmetic/add/AddRandomAccessibleIntervalToIterableInterval.java

@@ -32,6 +32,7 @@
 
 import net.imagej.ops.Contingent;
 import net.imagej.ops.Op;
+import net.imagej.ops.Ops;
 import net.imglib2.Cursor;
 import net.imglib2.IterableInterval;
 import net.imglib2.RandomAccess;
@@ -42,8 +43,10 @@
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 
-@Plugin(type = Op.class, name = Add.NAME)
-public class AddRandomAccessibleIntervalToIterableInterval<T extends NumericType<T>> implements Contingent, Add {
+@Plugin(type = Op.class, name = Ops.Add.NAME)
+public class AddRandomAccessibleIntervalToIterableInterval<T extends NumericType<T>>
+	implements Ops.Add, Contingent
+{
 
 	@Parameter(type = ItemIO.BOTH)
 	private IterableInterval<T> a;

src/main/java/net/imagej/ops/ascii/DefaultASCII.java

@@ -34,6 +34,7 @@
 
 import net.imagej.ops.Op;
 import net.imagej.ops.OpService;
+import net.imagej.ops.Ops;
 import net.imglib2.Cursor;
 import net.imglib2.IterableInterval;
 import net.imglib2.type.numeric.RealType;
@@ -48,8 +49,8 @@
  * 
  * @author Curtis Rueden
  */
-@Plugin(type = Op.class, name = ASCII.NAME)
-public class DefaultASCII<T extends RealType<T>> implements ASCII {
+@Plugin(type = Op.class, name = Ops.ASCII.NAME)
+public class DefaultASCII<T extends RealType<T>> implements Ops.ASCII {
 
 	private static final String CHARS = " .,-+o*O#";
 

src/main/java/net/imagej/ops/chunker/AbstractChunker.java

@@ -30,6 +30,8 @@
 
 package net.imagej.ops.chunker;
 
+import net.imagej.ops.Ops;
+
 import org.scijava.plugin.Parameter;
 import org.scijava.thread.ThreadService;
 

src/main/java/net/imagej/ops/chunker/Chunk.java

@@ -30,6 +30,7 @@
 
 package net.imagej.ops.chunker;
 
+import net.imagej.ops.Ops;
 import net.imagej.ops.Parallel;
 
 /**

src/main/java/net/imagej/ops/chunker/Chunker.java

@@ -31,25 +31,17 @@
 package net.imagej.ops.chunker;
 
 import net.imagej.ops.Op;
+import net.imagej.ops.Ops;
 
 import org.scijava.Cancelable;
 
 /**
- * Base interface for "chunker" operations. These operations execute code across
+ * A "chunker" operation which executes code across
  * chunks of data using multiple threads.
- * <p>
- * Implementing classes should be annotated with:
- * </p>
- * 
- * <pre>
- * @Plugin(type = Op.class, name = Chunker.NAME)
- * </pre>
  * 
  * @author Christian Dietz
  */
-public interface Chunker extends Op, Cancelable {
-
-	String NAME = "chunker";
+public interface Chunker extends Ops.Chunker, Cancelable {
 
 	/** Sets the {@link Chunk} for which will be multithreaded. */
 	void setChunk(final Chunk executor);

src/main/java/net/imagej/ops/chunker/DefaultChunker.java

@@ -34,6 +34,7 @@
 import java.util.concurrent.Future;
 
 import net.imagej.ops.Op;
+import net.imagej.ops.Ops;
 
 import org.scijava.log.LogService;
 import org.scijava.plugin.Parameter;

src/main/java/net/imagej/ops/chunker/InterleavedChunker.java

@@ -34,6 +34,7 @@
 import java.util.concurrent.Future;
 
 import net.imagej.ops.Op;
+import net.imagej.ops.Ops;
 
 import org.scijava.Priority;
 import org.scijava.log.LogService;

src/main/java/net/imagej/ops/commands/project/ProjectCommand.java

@@ -32,7 +32,7 @@
 
 import net.imagej.ops.AbstractStrictFunction;
 import net.imagej.ops.OpService;
-import net.imagej.ops.project.Project;
+import net.imagej.ops.Ops.Project;
 import net.imagej.ops.statistics.Mean;
 import net.imglib2.img.Img;
 import net.imglib2.meta.ImgPlus;

src/main/java/net/imagej/ops/convert/Convert.java

@@ -31,21 +31,13 @@
 package net.imagej.ops.convert;
 
 import net.imagej.ops.Function;
+import net.imagej.ops.Ops;
 
 /**
- * Base interface for "convert" operations.
- * <p>
- * Implementing classes should be annotated with:
- * </p>
- * 
- * <pre>
- * @Plugin(type = Op.class, name = Convert.NAME)
- * </pre>
+ * A typed conversion operation.
  * 
  * @author Martin Horn
  */
-public interface Convert<I, O> extends Function<I, O> {
-
-	String NAME = "convert";
-
+public interface Convert<I, O> extends Ops.Convert, Function<I, O> {
+	// NB: Marker interface.
 }

src/main/java/net/imagej/ops/convert/ConvertII.java

@@ -33,6 +33,7 @@
 import net.imagej.ops.AbstractStrictFunction;
 import net.imagej.ops.Op;
 import net.imagej.ops.OpService;
+import net.imagej.ops.Ops;
 import net.imglib2.IterableInterval;
 import net.imglib2.type.numeric.RealType;