For readability, use the same names and access modifiers in all convolvers

Author: tpietzsch

src/main/java/net/imglib2/algorithm/convolution/kernel/ConvolverNativeType.java

@@ -54,25 +54,25 @@
 public final class ConvolverNativeType< T extends NumericType< T > & NativeType< T > > implements Runnable
 {
 
-	final private double[] kernel;
+	private final double[] kernel;
 
-	final private RandomAccess< ? extends T > in;
+	private final RandomAccess< ? extends T > in;
 
-	final private RandomAccess< ? extends T > out;
+	private final RandomAccess< ? extends T > out;
 
-	final private int d;
+	private final int d;
 
 	private final int k1k;
 
-	final private int k1k1;
+	private final int k1k1;
 
-	final private long linelen;
+	private final long linelen;
 
-	final T b1;
+	private final T b1;
 
-	final T b2;
+	private final T b2;
 
-	final T tmp;
+	private final T tmp;
 
 	public ConvolverNativeType( final Kernel1D kernel, final RandomAccess< ? extends T > in, final RandomAccess< ? extends T > out, final int d, final long lineLength )
 	{
@@ -86,8 +86,8 @@ public ConvolverNativeType( final Kernel1D kernel, final RandomAccess< ? extends
 		k1k1 = k1k - 1;
 		linelen = lineLength;
 
-		T type = out.get();
-		final ArrayImg< T, ? > buf = new ArrayImgFactory< T >( type ).create( new long[] { k1k } );
+		final T type = out.get();
+		final ArrayImg< T, ? > buf = new ArrayImgFactory<>( type ).create( new long[] { k1k } );
 		b1 = buf.randomAccess().get();
 		b2 = buf.randomAccess().get();
 
@@ -113,7 +113,7 @@ private void next()
 		out.fwd( d );
 	}
 
-	private void process( T w )
+	private void process( final T w )
 	{
 		// move buf contents down
 		for ( int i = 0; i < k1k1; ++i )

src/main/java/net/imglib2/algorithm/convolution/kernel/ConvolverNumericType.java

@@ -52,23 +52,23 @@
 public final class ConvolverNumericType< T extends NumericType< T > > implements Runnable
 {
 
-	final private double[] kernel;
+	private final double[] kernel;
 
-	final private RandomAccess< ? extends T > in;
+	private final RandomAccess< ? extends T > in;
 
-	final private RandomAccess< ? extends T > out;
+	private final RandomAccess< ? extends T > out;
 
-	final private int d;
+	private final int d;
 
-	final private int k1k1;
+	private final int k1k;
 
-	final private int k1k;
+	private final int k1k1;
 
-	final private long fill2;
+	private final long linelen;
 
-	final private T[] buffer;
+	private final T[] buffer;
 
-	final private T tmp;
+	private final T tmp;
 
 	@SuppressWarnings( "unchecked" )
 	public ConvolverNumericType( final Kernel1D kernel, final RandomAccess< ? extends T > in, final RandomAccess< ? extends T > out, final int d, final long lineLength )
@@ -81,7 +81,7 @@ public ConvolverNumericType( final Kernel1D kernel, final RandomAccess< ? extend
 
 		k1k = this.kernel.length;
 		k1k1 = k1k - 1;
-		fill2 = lineLength;
+		linelen = lineLength;
 
 		T type = out.get();
 		buffer = ( T[] ) Array.newInstance( type.getClass(), k1k + 1 );
@@ -111,7 +111,7 @@ private void next()
 		out.fwd( d );
 	}
 
-	private void process( T tmp )
+	private void process( final T tmp )
 	{
 		for ( int i = 1; i < k1k; ++i )
 		{
@@ -127,7 +127,7 @@ public void run()
 	{
 		for ( int i = 0; i < k1k1; ++i )
 			prefill();
-		for ( long i = 0; i < fill2; ++i )
+		for ( long i = 0; i < linelen; ++i )
 			next();
 	}
 }

src/main/java/net/imglib2/algorithm/convolution/kernel/DoubleConvolverRealType.java

@@ -50,21 +50,21 @@
 public final class DoubleConvolverRealType implements Runnable
 {
 
-	final private double[] kernel;
+	private final double[] kernel;
 
-	final private RandomAccess< ? extends RealType< ? > > in;
+	private final RandomAccess< ? extends RealType< ? > > in;
 
-	final private RandomAccess< ? extends RealType< ? > > out;
+	private final RandomAccess< ? extends RealType< ? > > out;
 
-	final private int d;
+	private final int d;
 
-	final private int k1k1;
+	private final int k1k;
 
-	final private int k1k;
+	private final int k1k1;
 
-	final private long fill2;
+	private final long linelen;
 
-	final private double[] buffer;
+	private final double[] buffer;
 
 	public DoubleConvolverRealType( final Kernel1D kernel, final RandomAccess< ? extends RealType< ? > > in, final RandomAccess< ? extends RealType< ? > > out, final int d, final long lineLength )
 	{
@@ -76,7 +76,7 @@ public DoubleConvolverRealType( final Kernel1D kernel, final RandomAccess< ? ext
 
 		k1k = this.kernel.length;
 		k1k1 = k1k - 1;
-		fill2 = lineLength;
+		linelen = lineLength;
 		buffer = new double[ k1k + 1 ];
 	}
 
@@ -107,7 +107,7 @@ public void run()
 	{
 		for ( int i = 0; i < k1k1; ++i )
 			prefill();
-		for ( long i = 0; i < fill2; ++i )
+		for ( long i = 0; i < linelen; ++i )
 			next();
 	}
 }

src/main/java/net/imglib2/algorithm/convolution/kernel/FloatConvolverRealType.java

@@ -50,21 +50,21 @@
 public final class FloatConvolverRealType implements Runnable
 {
 
-	final private float[] kernel;
+	private final float[] kernel;
 
-	final private RandomAccess< ? extends RealType< ? > > in;
+	private final RandomAccess< ? extends RealType< ? > > in;
 
-	final private RandomAccess< ? extends RealType< ? > > out;
+	private final RandomAccess< ? extends RealType< ? > > out;
 
-	final private int d;
+	private final int d;
 
-	final private int k1k1;
+	private final int k1k;
 
-	final private int k1k;
+	private final int k1k1;
 
-	final private long fill2;
+	private final long linelen;
 
-	final private float[] buffer;
+	private final float[] buffer;
 
 	public FloatConvolverRealType( final Kernel1D kernel, final RandomAccess< ? extends RealType< ? > > in, final RandomAccess< ? extends RealType< ? > > out, final int d, final long lineLength )
 	{
@@ -76,7 +76,7 @@ public FloatConvolverRealType( final Kernel1D kernel, final RandomAccess< ? exte
 
 		k1k = this.kernel.length;
 		k1k1 = k1k - 1;
-		fill2 = lineLength;
+		linelen = lineLength;
 		buffer = new float[ k1k + 1 ];
 	}
 
@@ -115,7 +115,7 @@ public void run()
 	{
 		for ( int i = 0; i < k1k1; ++i )
 			prefill();
-		for ( long i = 0; i < fill2; ++i )
+		for ( long i = 0; i < linelen; ++i )
 			next();
 	}
 }