From 2987af7f5fef510a2072324284a459c9ff4efcb6 Mon Sep 17 00:00:00 2001
From: tpietzsch <tobias.pietzsch@gmail.com>
Date: Thu, 24 Sep 2020 13:16:50 +0200
Subject: [PATCH] Clean up: Remove unnecessary modifiers
---
src/main/java/bdv/ViewerImgLoader.java | 4 +--
src/main/java/bdv/ViewerSetupImgLoader.java | 4 +--
.../bdv/export/Hdf5BlockWriterThread.java | 4 +--
src/main/java/bdv/export/IHDF5Access.java | 12 ++++-----
src/main/java/bdv/export/ProgressWriter.java | 6 ++---
.../java/bdv/img/cache/EmptyArrayCreator.java | 4 +--
src/main/java/bdv/img/hdf5/IHDF5Access.java | 14 +++++-----
src/main/java/bdv/img/imaris/DataTypes.java | 8 +++---
src/main/java/bdv/img/imaris/IHDF5Access.java | 18 ++++++-------
.../legacy/LegacyViewerImgLoader.java | 14 +++++-----
.../bdv/tools/brightness/MinMaxGroup.java | 2 +-
.../tools/brightness/SetupAssignments.java | 2 +-
.../tools/brightness/SliderPanelDouble.java | 4 +--
src/main/java/bdv/util/BoundedValue.java | 2 +-
.../java/bdv/util/BoundedValueDouble.java | 2 +-
.../bdv/viewer/InterpolationModeListener.java | 2 +-
src/main/java/bdv/viewer/Source.java | 26 +++++++------------
.../bdv/viewer/overlay/MultiBoxOverlay.java | 6 ++---
.../bdv/viewer/render/MipmapOrdering.java | 14 +++++-----
.../net/imglib2/display/ColorConverter.java | 6 ++---
.../display/RealARGBColorConverter.java | 2 +-
21 files changed, 74 insertions(+), 82 deletions(-)
diff --git a/src/main/java/bdv/ViewerImgLoader.java b/src/main/java/bdv/ViewerImgLoader.java
index 42c6ef38..e398116b 100644
--- a/src/main/java/bdv/ViewerImgLoader.java
+++ b/src/main/java/bdv/ViewerImgLoader.java
@@ -34,7 +34,7 @@ import mpicbg.spim.data.generic.sequence.BasicMultiResolutionImgLoader;
public interface ViewerImgLoader extends BasicMultiResolutionImgLoader
{
@Override
- public ViewerSetupImgLoader< ?, ? > getSetupImgLoader( final int setupId );
+ ViewerSetupImgLoader< ?, ? > getSetupImgLoader( final int setupId );
- public CacheControl getCacheControl();
+ CacheControl getCacheControl();
}
diff --git a/src/main/java/bdv/ViewerSetupImgLoader.java b/src/main/java/bdv/ViewerSetupImgLoader.java
index 48ea2768..193749c9 100644
--- a/src/main/java/bdv/ViewerSetupImgLoader.java
+++ b/src/main/java/bdv/ViewerSetupImgLoader.java
@@ -35,7 +35,7 @@ import net.imglib2.Volatile;
public interface ViewerSetupImgLoader< T, V extends Volatile< T > > extends BasicMultiResolutionSetupImgLoader< T >
{
- public RandomAccessibleInterval< V > getVolatileImage( final int timepointId, final int level, ImgLoaderHint... hints );
+ RandomAccessibleInterval< V > getVolatileImage( final int timepointId, final int level, ImgLoaderHint... hints );
- public V getVolatileImageType();
+ V getVolatileImageType();
}
diff --git a/src/main/java/bdv/export/Hdf5BlockWriterThread.java b/src/main/java/bdv/export/Hdf5BlockWriterThread.java
index 63396529..a799c401 100644
--- a/src/main/java/bdv/export/Hdf5BlockWriterThread.java
+++ b/src/main/java/bdv/export/Hdf5BlockWriterThread.java
@@ -41,9 +41,9 @@ class Hdf5BlockWriterThread extends Thread implements IHDF5Access
{
private final IHDF5Access hdf5Access;
- private static interface Hdf5Task
+ private interface Hdf5Task
{
- public void run( final IHDF5Access hdf5Access );
+ void run( final IHDF5Access hdf5Access );
}
private final BlockingQueue< Hdf5BlockWriterThread.Hdf5Task > queue;
diff --git a/src/main/java/bdv/export/IHDF5Access.java b/src/main/java/bdv/export/IHDF5Access.java
index 48b097c5..ac6dd19c 100644
--- a/src/main/java/bdv/export/IHDF5Access.java
+++ b/src/main/java/bdv/export/IHDF5Access.java
@@ -33,16 +33,16 @@ import ch.systemsx.cisd.hdf5.IHDF5Writer;
interface IHDF5Access
{
- public void writeMipmapDescription( final int setupIdPartition, final ExportMipmapInfo mipmapInfo );
+ void writeMipmapDescription( final int setupIdPartition, final ExportMipmapInfo mipmapInfo );
- public void createAndOpenDataset( final String path, long[] dimensions, int[] cellDimensions, HDF5IntStorageFeatures features );
+ void createAndOpenDataset( final String path, long[] dimensions, int[] cellDimensions, HDF5IntStorageFeatures features );
- public void writeBlockWithOffset( final short[] data, final long[] blockDimensions, final long[] offset );
+ void writeBlockWithOffset( final short[] data, final long[] blockDimensions, final long[] offset );
- public void closeDataset();
+ void closeDataset();
- public void close();
+ void close();
// this is for sharing with Hdf5ImageLoader for loopback loader when exporting
- public IHDF5Writer getIHDF5Writer();
+ IHDF5Writer getIHDF5Writer();
}
diff --git a/src/main/java/bdv/export/ProgressWriter.java b/src/main/java/bdv/export/ProgressWriter.java
index 4fce9e5a..f8ec44c2 100644
--- a/src/main/java/bdv/export/ProgressWriter.java
+++ b/src/main/java/bdv/export/ProgressWriter.java
@@ -32,9 +32,9 @@ import java.io.PrintStream;
public interface ProgressWriter
{
- public PrintStream out();
+ PrintStream out();
- public PrintStream err();
+ PrintStream err();
- public void setProgress( double completionRatio );
+ void setProgress( double completionRatio );
}
diff --git a/src/main/java/bdv/img/cache/EmptyArrayCreator.java b/src/main/java/bdv/img/cache/EmptyArrayCreator.java
index 4cfd8810..cb200ead 100644
--- a/src/main/java/bdv/img/cache/EmptyArrayCreator.java
+++ b/src/main/java/bdv/img/cache/EmptyArrayCreator.java
@@ -49,9 +49,9 @@ import net.imglib2.type.PrimitiveType;
*/
public interface EmptyArrayCreator< A >
{
- public A getEmptyArray( final long numEntities );
+ A getEmptyArray( final long numEntities );
- public static < A extends VolatileArrayDataAccess< A > > EmptyArrayCreator< A > get(
+ static < A extends VolatileArrayDataAccess< A > > EmptyArrayCreator< A > get(
final PrimitiveType primitiveType,
final boolean dirty )
{
diff --git a/src/main/java/bdv/img/hdf5/IHDF5Access.java b/src/main/java/bdv/img/hdf5/IHDF5Access.java
index 61170ba1..f0f07a7f 100644
--- a/src/main/java/bdv/img/hdf5/IHDF5Access.java
+++ b/src/main/java/bdv/img/hdf5/IHDF5Access.java
@@ -30,17 +30,17 @@ package bdv.img.hdf5;
interface IHDF5Access
{
- public DimsAndExistence getDimsAndExistence( final ViewLevelId id );
+ DimsAndExistence getDimsAndExistence( final ViewLevelId id );
- public short[] readShortMDArrayBlockWithOffset( final int timepoint, final int setup, final int level, final int[] dimensions, final long[] min ) throws InterruptedException;
+ short[] readShortMDArrayBlockWithOffset( final int timepoint, final int setup, final int level, final int[] dimensions, final long[] min ) throws InterruptedException;
- public short[] readShortMDArrayBlockWithOffset( final int timepoint, final int setup, final int level, final int[] dimensions, final long[] min, final short[] dataBlock ) throws InterruptedException;
+ short[] readShortMDArrayBlockWithOffset( final int timepoint, final int setup, final int level, final int[] dimensions, final long[] min, final short[] dataBlock ) throws InterruptedException;
- public float[] readShortMDArrayBlockWithOffsetAsFloat( final int timepoint, final int setup, final int level, final int[] dimensions, final long[] min ) throws InterruptedException;
+ float[] readShortMDArrayBlockWithOffsetAsFloat( final int timepoint, final int setup, final int level, final int[] dimensions, final long[] min ) throws InterruptedException;
- public float[] readShortMDArrayBlockWithOffsetAsFloat( final int timepoint, final int setup, final int level, final int[] dimensions, final long[] min, final float[] dataBlock ) throws InterruptedException;
+ float[] readShortMDArrayBlockWithOffsetAsFloat( final int timepoint, final int setup, final int level, final int[] dimensions, final long[] min, final float[] dataBlock ) throws InterruptedException;
- public void closeAllDataSets();
+ void closeAllDataSets();
- public void close();
+ void close();
}
diff --git a/src/main/java/bdv/img/imaris/DataTypes.java b/src/main/java/bdv/img/imaris/DataTypes.java
index 20d5c28e..3f35908b 100644
--- a/src/main/java/bdv/img/imaris/DataTypes.java
+++ b/src/main/java/bdv/img/imaris/DataTypes.java
@@ -44,16 +44,16 @@ import net.imglib2.type.volatiles.VolatileUnsignedShortType;
class DataTypes
{
- static interface DataType<
+ interface DataType<
T extends NativeType< T >,
V extends Volatile< T > & NativeType< V > ,
A extends VolatileAccess >
{
- public T getType();
+ T getType();
- public V getVolatileType();
+ V getVolatileType();
- public CacheArrayLoader< A > createArrayLoader( final IHDF5Access hdf5Access );
+ CacheArrayLoader< A > createArrayLoader( final IHDF5Access hdf5Access );
}
static DataType< UnsignedByteType, VolatileUnsignedByteType, VolatileByteArray > UnsignedByte =
diff --git a/src/main/java/bdv/img/imaris/IHDF5Access.java b/src/main/java/bdv/img/imaris/IHDF5Access.java
index 027ae9a3..b58f34f5 100644
--- a/src/main/java/bdv/img/imaris/IHDF5Access.java
+++ b/src/main/java/bdv/img/imaris/IHDF5Access.java
@@ -33,21 +33,21 @@ import bdv.img.hdf5.ViewLevelId;
public interface IHDF5Access
{
- public DimsAndExistence getDimsAndExistence( final ViewLevelId id );
+ DimsAndExistence getDimsAndExistence( final ViewLevelId id );
- public byte[] readByteMDArrayBlockWithOffset( final int timepoint, final int setup, final int level, final int[] dimensions, final long[] min ) throws InterruptedException;
+ byte[] readByteMDArrayBlockWithOffset( final int timepoint, final int setup, final int level, final int[] dimensions, final long[] min ) throws InterruptedException;
- public byte[] readByteMDArrayBlockWithOffset( final int timepoint, final int setup, final int level, final int[] dimensions, final long[] min, final byte[] dataBlock ) throws InterruptedException;
+ byte[] readByteMDArrayBlockWithOffset( final int timepoint, final int setup, final int level, final int[] dimensions, final long[] min, final byte[] dataBlock ) throws InterruptedException;
- public short[] readShortMDArrayBlockWithOffset( final int timepoint, final int setup, final int level, final int[] dimensions, final long[] min ) throws InterruptedException;
+ short[] readShortMDArrayBlockWithOffset( final int timepoint, final int setup, final int level, final int[] dimensions, final long[] min ) throws InterruptedException;
- public short[] readShortMDArrayBlockWithOffset( final int timepoint, final int setup, final int level, final int[] dimensions, final long[] min, final short[] dataBlock ) throws InterruptedException;
+ short[] readShortMDArrayBlockWithOffset( final int timepoint, final int setup, final int level, final int[] dimensions, final long[] min, final short[] dataBlock ) throws InterruptedException;
- public float[] readFloatMDArrayBlockWithOffset( final int timepoint, final int setup, final int level, final int[] dimensions, final long[] min ) throws InterruptedException;
+ float[] readFloatMDArrayBlockWithOffset( final int timepoint, final int setup, final int level, final int[] dimensions, final long[] min ) throws InterruptedException;
- public float[] readFloatMDArrayBlockWithOffset( final int timepoint, final int setup, final int level, final int[] dimensions, final long[] min, final float[] dataBlock ) throws InterruptedException;
+ float[] readFloatMDArrayBlockWithOffset( final int timepoint, final int setup, final int level, final int[] dimensions, final long[] min, final float[] dataBlock ) throws InterruptedException;
- public String readImarisAttributeString( final String objectPath, final String attributeName );
+ String readImarisAttributeString( final String objectPath, final String attributeName );
- public String readImarisAttributeString( final String objectPath, final String attributeName, final String defaultValue );
+ String readImarisAttributeString( final String objectPath, final String attributeName, final String defaultValue );
}
diff --git a/src/main/java/bdv/spimdata/legacy/LegacyViewerImgLoader.java b/src/main/java/bdv/spimdata/legacy/LegacyViewerImgLoader.java
index fa41b349..35fe12b3 100644
--- a/src/main/java/bdv/spimdata/legacy/LegacyViewerImgLoader.java
+++ b/src/main/java/bdv/spimdata/legacy/LegacyViewerImgLoader.java
@@ -38,17 +38,17 @@ import net.imglib2.realtransform.AffineTransform3D;
//@Deprecated
public interface LegacyViewerImgLoader< T, V extends Volatile< T > > extends LegacyBasicImgLoader< T >
{
- public RandomAccessibleInterval< T > getImage( final ViewId view, final int level );
+ RandomAccessibleInterval< T > getImage( final ViewId view, final int level );
- public RandomAccessibleInterval< V > getVolatileImage( final ViewId view, final int level );
+ RandomAccessibleInterval< V > getVolatileImage( final ViewId view, final int level );
- public V getVolatileImageType();
+ V getVolatileImageType();
- public double[][] getMipmapResolutions( final int setupId );
+ double[][] getMipmapResolutions( final int setupId );
- public AffineTransform3D[] getMipmapTransforms( final int setupId );
+ AffineTransform3D[] getMipmapTransforms( final int setupId );
- public int numMipmapLevels( final int setupId );
+ int numMipmapLevels( final int setupId );
- public CacheControl getCache();
+ CacheControl getCache();
}
diff --git a/src/main/java/bdv/tools/brightness/MinMaxGroup.java b/src/main/java/bdv/tools/brightness/MinMaxGroup.java
index c879ee2f..1c1bcf34 100644
--- a/src/main/java/bdv/tools/brightness/MinMaxGroup.java
+++ b/src/main/java/bdv/tools/brightness/MinMaxGroup.java
@@ -61,7 +61,7 @@ public class MinMaxGroup extends BoundedIntervalDouble
public interface UpdateListener
{
- public void update();
+ void update();
}
private UpdateListener updateListener;
diff --git a/src/main/java/bdv/tools/brightness/SetupAssignments.java b/src/main/java/bdv/tools/brightness/SetupAssignments.java
index 13798c11..15e13bf3 100644
--- a/src/main/java/bdv/tools/brightness/SetupAssignments.java
+++ b/src/main/java/bdv/tools/brightness/SetupAssignments.java
@@ -83,7 +83,7 @@ public class SetupAssignments
public interface UpdateListener
{
- public void update();
+ void update();
}
private UpdateListener updateListener;
diff --git a/src/main/java/bdv/tools/brightness/SliderPanelDouble.java b/src/main/java/bdv/tools/brightness/SliderPanelDouble.java
index b452b029..463413df 100644
--- a/src/main/java/bdv/tools/brightness/SliderPanelDouble.java
+++ b/src/main/java/bdv/tools/brightness/SliderPanelDouble.java
@@ -70,9 +70,9 @@ public class SliderPanelDouble extends JPanel implements BoundedValueDouble.Upda
private RangeListener rangeListener;
- public static interface RangeListener
+ public interface RangeListener
{
- public void rangeChanged();
+ void rangeChanged();
}
/**
diff --git a/src/main/java/bdv/util/BoundedValue.java b/src/main/java/bdv/util/BoundedValue.java
index 8ead6dd7..0e9c1232 100644
--- a/src/main/java/bdv/util/BoundedValue.java
+++ b/src/main/java/bdv/util/BoundedValue.java
@@ -45,7 +45,7 @@ public class BoundedValue
public interface UpdateListener
{
- public void update();
+ void update();
}
private UpdateListener updateListener;
diff --git a/src/main/java/bdv/util/BoundedValueDouble.java b/src/main/java/bdv/util/BoundedValueDouble.java
index b98b797a..3561a014 100644
--- a/src/main/java/bdv/util/BoundedValueDouble.java
+++ b/src/main/java/bdv/util/BoundedValueDouble.java
@@ -45,7 +45,7 @@ public class BoundedValueDouble
public interface UpdateListener
{
- public void update();
+ void update();
}
private UpdateListener updateListener;
diff --git a/src/main/java/bdv/viewer/InterpolationModeListener.java b/src/main/java/bdv/viewer/InterpolationModeListener.java
index 2ac49348..06cabdb7 100644
--- a/src/main/java/bdv/viewer/InterpolationModeListener.java
+++ b/src/main/java/bdv/viewer/InterpolationModeListener.java
@@ -30,5 +30,5 @@ package bdv.viewer;
public interface InterpolationModeListener
{
- public void interpolationModeChanged( final Interpolation mode );
+ void interpolationModeChanged( final Interpolation mode );
}
diff --git a/src/main/java/bdv/viewer/Source.java b/src/main/java/bdv/viewer/Source.java
index 63885f00..68e2e1c5 100644
--- a/src/main/java/bdv/viewer/Source.java
+++ b/src/main/java/bdv/viewer/Source.java
@@ -55,7 +55,7 @@ public interface Source< T >
* timepoint index
* @return true, if there is data for timepoint index t.
*/
- public boolean isPresent( int t );
+ boolean isPresent( int t );
/**
* Get the 3D stack at timepoint index t.
@@ -66,7 +66,7 @@ public interface Source< T >
* mipmap level
* @return the {@link RandomAccessibleInterval stack}.
*/
- public RandomAccessibleInterval< T > getSource( int t, int level );
+ RandomAccessibleInterval< T > getSource( int t, int level );
/**
* Whether this source participates in bounding box culling.
@@ -80,7 +80,7 @@ public interface Source< T >
*
* @return {@code true}, if this source participates in bounding box culling.
*/
- public default boolean doBoundingBoxCulling()
+ default boolean doBoundingBoxCulling()
{
return true;
}
@@ -96,15 +96,7 @@ public interface Source< T >
* interpolation method to use
* @return the extended and interpolated {@link RandomAccessible stack}.
*/
- public RealRandomAccessible< T > getInterpolatedSource( final int t, final int level, final Interpolation method );
-
- /*
- * TODO: Consider adding the methods for getting Source with explicit
- * ThreadGroup key (in case we don't want it to be the current thread's
- * ThreadGroup).
- */
-// public default RandomAccessibleInterval< T > getSource( int t, int level, ThreadGroup threadGroup );
-// public RealRandomAccessible< T > getInterpolatedSource( final int t, final int level, final Interpolation method, ThreadGroup threadGroup );
+ RealRandomAccessible< T > getInterpolatedSource( final int t, final int level, final Interpolation method );
/**
* Get the transform from the {@link #getSource(int, int) source} at the
@@ -118,26 +110,26 @@ public interface Source< T >
* is set to the source-to-global transform, that transforms
* source coordinates into the global coordinates
*/
- public void getSourceTransform( int t, int level, AffineTransform3D transform );
+ void getSourceTransform( int t, int level, AffineTransform3D transform );
/**
* Get an instance of the pixel type.
* @return instance of pixel type.
*/
- public T getType();
+ T getType();
/**
* Get the name of the source.
* @return the name of the source.
*/
- public String getName();
+ String getName();
/**
* Get voxel size and unit for this source. May return null.
*
* @return voxel size and unit or {@code null}.
*/
- public VoxelDimensions getVoxelDimensions();
+ VoxelDimensions getVoxelDimensions();
- public int getNumMipmapLevels();
+ int getNumMipmapLevels();
}
diff --git a/src/main/java/bdv/viewer/overlay/MultiBoxOverlay.java b/src/main/java/bdv/viewer/overlay/MultiBoxOverlay.java
index 56c8e4e2..fdc65d5b 100644
--- a/src/main/java/bdv/viewer/overlay/MultiBoxOverlay.java
+++ b/src/main/java/bdv/viewer/overlay/MultiBoxOverlay.java
@@ -70,21 +70,21 @@ public class MultiBoxOverlay
public interface IntervalAndTransform
{
- public boolean isVisible();
+ boolean isVisible();
/**
* Get interval of the source (stack) in source-local coordinates.
*
* @return extents of the source.
*/
- public Interval getSourceInterval();
+ Interval getSourceInterval();
/**
* Current transformation from {@link #getSourceInterval() source} to
* viewer. This is a concatenation of source-local-to-global transform
* and the interactive viewer transform.
*/
- public AffineTransform3D getSourceToViewer();
+ AffineTransform3D getSourceToViewer();
}
/**
diff --git a/src/main/java/bdv/viewer/render/MipmapOrdering.java b/src/main/java/bdv/viewer/render/MipmapOrdering.java
index 18122a7c..9de2ba7b 100644
--- a/src/main/java/bdv/viewer/render/MipmapOrdering.java
+++ b/src/main/java/bdv/viewer/render/MipmapOrdering.java
@@ -47,9 +47,9 @@ public interface MipmapOrdering
* @param previousTimepoint
* previous timepoint index
*/
- public MipmapHints getMipmapHints( AffineTransform3D screenTransform, int timepoint, int previousTimepoint );
+ MipmapHints getMipmapHints( AffineTransform3D screenTransform, int timepoint, int previousTimepoint );
- public static class Level
+ class Level
{
// level index in Source
private final int mipmapLevel;
@@ -111,7 +111,7 @@ public interface MipmapOrdering
}
}
- public static class RenderOrderComparator implements Comparator< Level >
+ class RenderOrderComparator implements Comparator< Level >
{
@Override
public int compare( final Level o1, final Level o2 )
@@ -120,7 +120,7 @@ public interface MipmapOrdering
}
}
- public static class PrefetchOrderComparator implements Comparator< Level >
+ class PrefetchOrderComparator implements Comparator< Level >
{
@Override
public int compare( final Level o1, final Level o2 )
@@ -129,11 +129,11 @@ public interface MipmapOrdering
}
}
- public static RenderOrderComparator renderOrderComparator = new RenderOrderComparator();
+ RenderOrderComparator renderOrderComparator = new RenderOrderComparator();
- public static PrefetchOrderComparator prefetchOrderComparator = new PrefetchOrderComparator();
+ PrefetchOrderComparator prefetchOrderComparator = new PrefetchOrderComparator();
- public static class MipmapHints
+ class MipmapHints
{
private final List< Level > levels;
diff --git a/src/main/java/net/imglib2/display/ColorConverter.java b/src/main/java/net/imglib2/display/ColorConverter.java
index 564d8052..ffde94ae 100644
--- a/src/main/java/net/imglib2/display/ColorConverter.java
+++ b/src/main/java/net/imglib2/display/ColorConverter.java
@@ -32,9 +32,9 @@ import net.imglib2.type.numeric.ARGBType;
public interface ColorConverter extends LinearRange
{
- public ARGBType getColor();
+ ARGBType getColor();
- public void setColor( final ARGBType c );
+ void setColor( final ARGBType c );
- public boolean supportsColor();
+ boolean supportsColor();
}
diff --git a/src/main/java/net/imglib2/display/RealARGBColorConverter.java b/src/main/java/net/imglib2/display/RealARGBColorConverter.java
index bc8f0a3e..5a66799f 100644
--- a/src/main/java/net/imglib2/display/RealARGBColorConverter.java
+++ b/src/main/java/net/imglib2/display/RealARGBColorConverter.java
@@ -35,7 +35,7 @@ import net.imglib2.type.numeric.RealType;
public interface RealARGBColorConverter< R extends RealType< ? > > extends ColorConverter, Converter< R, ARGBType >
{
- public static < R extends RealType< ? > > RealARGBColorConverter< R > create( final R type, final double min, final double max )
+ static < R extends RealType< ? > > RealARGBColorConverter< R > create( final R type, final double min, final double max )
{
return Instances.create( type, min, max );
}
--
GitLab