diff --git a/src/main/java/mpicbg/spim/data/generic/sequence/BasicImgLoader.java b/src/main/java/mpicbg/spim/data/generic/sequence/BasicImgLoader.java index 9244840..f0ec3b2 100644 --- a/src/main/java/mpicbg/spim/data/generic/sequence/BasicImgLoader.java +++ b/src/main/java/mpicbg/spim/data/generic/sequence/BasicImgLoader.java @@ -46,5 +46,5 @@ public interface BasicImgLoader * view setup for which to get the {@link BasicSetupImgLoader}. * @return {@link BasicSetupImgLoader} for the specified view setup. */ - public BasicSetupImgLoader< ? > getSetupImgLoader( final int setupId ); + BasicSetupImgLoader< ? > getSetupImgLoader( int setupId ); } diff --git a/src/main/java/mpicbg/spim/data/generic/sequence/BasicMultiResolutionImgLoader.java b/src/main/java/mpicbg/spim/data/generic/sequence/BasicMultiResolutionImgLoader.java index 89551b0..55f8426 100644 --- a/src/main/java/mpicbg/spim/data/generic/sequence/BasicMultiResolutionImgLoader.java +++ b/src/main/java/mpicbg/spim/data/generic/sequence/BasicMultiResolutionImgLoader.java @@ -47,5 +47,5 @@ public interface BasicMultiResolutionImgLoader extends BasicImgLoader * setup. */ @Override - public BasicMultiResolutionSetupImgLoader< ? > getSetupImgLoader( final int setupId ); + BasicMultiResolutionSetupImgLoader< ? > getSetupImgLoader( int setupId ); } diff --git a/src/main/java/mpicbg/spim/data/generic/sequence/BasicMultiResolutionSetupImgLoader.java b/src/main/java/mpicbg/spim/data/generic/sequence/BasicMultiResolutionSetupImgLoader.java index a67176d..53e6846 100644 --- a/src/main/java/mpicbg/spim/data/generic/sequence/BasicMultiResolutionSetupImgLoader.java +++ b/src/main/java/mpicbg/spim/data/generic/sequence/BasicMultiResolutionSetupImgLoader.java @@ -57,7 +57,7 @@ public interface BasicMultiResolutionSetupImgLoader< T > extends BasicSetupImgLo * optional hints regarding how to load the image. * @return image of type T. */ - public RandomAccessibleInterval< T > getImage( final int timepointId, final int level, ImgLoaderHint... hints ); + RandomAccessibleInterval< T > getImage( int timepointId, final int level, ImgLoaderHint... hints ); /** * Get the sub-sampling factors, indexed by resolution level and dimension. @@ -66,7 +66,7 @@ public interface BasicMultiResolutionSetupImgLoader< T > extends BasicSetupImgLo * * @return sub-sampling factors, indexed by resolution level and dimension. */ - public double[][] getMipmapResolutions(); + double[][] getMipmapResolutions(); /** * Get the transformation from coordinates of the sub-sampled image of a a @@ -75,12 +75,12 @@ public interface BasicMultiResolutionSetupImgLoader< T > extends BasicSetupImgLo * * @return array with one transformation for each mipmap level. */ - public AffineTransform3D[] getMipmapTransforms(); + AffineTransform3D[] getMipmapTransforms(); /** * Get number of resolution levels. * * @return number of resolution levels. */ - public int numMipmapLevels(); + int numMipmapLevels(); } diff --git a/src/main/java/mpicbg/spim/data/generic/sequence/BoundedTypeBasicImgLoader.java b/src/main/java/mpicbg/spim/data/generic/sequence/BoundedTypeBasicImgLoader.java index aff9bf7..23a5e83 100644 --- a/src/main/java/mpicbg/spim/data/generic/sequence/BoundedTypeBasicImgLoader.java +++ b/src/main/java/mpicbg/spim/data/generic/sequence/BoundedTypeBasicImgLoader.java @@ -31,5 +31,5 @@ public interface BoundedTypeBasicImgLoader< T > extends BasicImgLoader { @Override - public BasicSetupImgLoader< ? extends T > getSetupImgLoader( final int setupId ); + BasicSetupImgLoader< ? extends T > getSetupImgLoader( int setupId ); } diff --git a/src/main/java/mpicbg/spim/data/generic/sequence/TypedBasicImgLoader.java b/src/main/java/mpicbg/spim/data/generic/sequence/TypedBasicImgLoader.java index 7d0a065..89d094c 100644 --- a/src/main/java/mpicbg/spim/data/generic/sequence/TypedBasicImgLoader.java +++ b/src/main/java/mpicbg/spim/data/generic/sequence/TypedBasicImgLoader.java @@ -31,5 +31,5 @@ public interface TypedBasicImgLoader< T > extends BoundedTypeBasicImgLoader< T > { @Override - public BasicSetupImgLoader< T > getSetupImgLoader( final int setupId ); + BasicSetupImgLoader< T > getSetupImgLoader( int setupId ); } diff --git a/src/main/java/mpicbg/spim/data/generic/sequence/XmlIoBasicImgLoader.java b/src/main/java/mpicbg/spim/data/generic/sequence/XmlIoBasicImgLoader.java index 6a57a11..774666f 100644 --- a/src/main/java/mpicbg/spim/data/generic/sequence/XmlIoBasicImgLoader.java +++ b/src/main/java/mpicbg/spim/data/generic/sequence/XmlIoBasicImgLoader.java @@ -35,7 +35,7 @@ public interface XmlIoBasicImgLoader< T extends BasicImgLoader > { - Element toXml( final T imgLoader, final File basePath ); + Element toXml( T imgLoader, File basePath ); /** * Subclasses that construct ImgLoaders that are able to read from sources @@ -57,7 +57,7 @@ default Element toXml( final T imgLoader, final URI basePathURI ) return toXml( imgLoader, basePath ); } - T fromXml( final Element elem, final File basePath, AbstractSequenceDescription< ?, ?, ? > sequenceDescription ); + T fromXml( Element elem, File basePath, AbstractSequenceDescription< ?, ?, ? > sequenceDescription ); /** * Subclasses that construct ImgLoaders that are able to read from sources diff --git a/src/main/java/mpicbg/spim/data/registration/ViewTransform.java b/src/main/java/mpicbg/spim/data/registration/ViewTransform.java index 5070699..5ae31b8 100644 --- a/src/main/java/mpicbg/spim/data/registration/ViewTransform.java +++ b/src/main/java/mpicbg/spim/data/registration/ViewTransform.java @@ -38,7 +38,7 @@ public interface ViewTransform * * @return true, if this transform has a name. */ - public boolean hasName(); + boolean hasName(); /** * Get the name of this transform. @@ -46,7 +46,7 @@ public interface ViewTransform * * @return the name of this transform or null if it is not set. */ - public String getName(); + String getName(); /** * A representation of this {@link ViewTransform} as a 3D {@link AffineGet}. @@ -54,5 +54,5 @@ public interface ViewTransform * * @return 3D affine representation of this transform. */ - public AffineGet asAffine3D(); + AffineGet asAffine3D(); } diff --git a/src/main/java/mpicbg/spim/data/registration/ViewTransformGeneric.java b/src/main/java/mpicbg/spim/data/registration/ViewTransformGeneric.java index b4bfeff..6c85541 100644 --- a/src/main/java/mpicbg/spim/data/registration/ViewTransformGeneric.java +++ b/src/main/java/mpicbg/spim/data/registration/ViewTransformGeneric.java @@ -37,10 +37,10 @@ public interface ViewTransformGeneric extends ViewTransform /** * initialize the transform from a <{@value XmlKeys#VIEWTRANSFORM_TAG}> DOM element. */ - public void init( final Element elem ); + void init( Element elem ); /** * create a <{@value XmlKeys#VIEWTRANSFORM_TAG}> DOM element for this {@link ViewTransform}. */ - public Element toXml(); + Element toXml(); } diff --git a/src/main/java/mpicbg/spim/data/sequence/ImgLoader.java b/src/main/java/mpicbg/spim/data/sequence/ImgLoader.java index f791005..93ae594 100644 --- a/src/main/java/mpicbg/spim/data/sequence/ImgLoader.java +++ b/src/main/java/mpicbg/spim/data/sequence/ImgLoader.java @@ -48,5 +48,5 @@ public interface ImgLoader extends BasicImgLoader * @return {@link SetupImgLoader} for the specified view setup. */ @Override - public SetupImgLoader< ? > getSetupImgLoader( final int setupId ); + SetupImgLoader< ? > getSetupImgLoader( int setupId ); } diff --git a/src/main/java/mpicbg/spim/data/sequence/MultiResolutionImgLoader.java b/src/main/java/mpicbg/spim/data/sequence/MultiResolutionImgLoader.java index 495f881..0a8e2c3 100644 --- a/src/main/java/mpicbg/spim/data/sequence/MultiResolutionImgLoader.java +++ b/src/main/java/mpicbg/spim/data/sequence/MultiResolutionImgLoader.java @@ -49,5 +49,5 @@ public interface MultiResolutionImgLoader extends BasicMultiResolutionImgLoader, * setup. */ @Override - public MultiResolutionSetupImgLoader< ? > getSetupImgLoader( final int setupId ); + MultiResolutionSetupImgLoader< ? > getSetupImgLoader( int setupId ); } diff --git a/src/main/java/mpicbg/spim/data/sequence/MultiResolutionSetupImgLoader.java b/src/main/java/mpicbg/spim/data/sequence/MultiResolutionSetupImgLoader.java index 28eeb16..97acc11 100644 --- a/src/main/java/mpicbg/spim/data/sequence/MultiResolutionSetupImgLoader.java +++ b/src/main/java/mpicbg/spim/data/sequence/MultiResolutionSetupImgLoader.java @@ -56,7 +56,7 @@ public interface MultiResolutionSetupImgLoader< T > extends BasicMultiResolutionSetupImgLoader< T >, SetupImgLoader< T > { @Override - public default RandomAccessibleInterval< FloatType > getFloatImage( final int timepointId, final boolean normalize, final ImgLoaderHint... hints ) + default RandomAccessibleInterval< FloatType > getFloatImage( final int timepointId, final boolean normalize, final ImgLoaderHint... hints ) { return getFloatImage( timepointId, 0, normalize, hints ); } @@ -77,7 +77,7 @@ public default RandomAccessibleInterval< FloatType > getFloatImage( final int ti * @return {@link FloatType} image */ @SuppressWarnings( { "unchecked", "rawtypes" } ) - public default RandomAccessibleInterval< FloatType > getFloatImage( final int timepointId, final int level, final boolean normalize, final ImgLoaderHint... hints ) + default RandomAccessibleInterval< FloatType > getFloatImage( final int timepointId, final int level, final boolean normalize, final ImgLoaderHint... hints ) { final T type = getImageType(); if ( !( type instanceof RealType ) ) @@ -119,7 +119,7 @@ public default RandomAccessibleInterval< FloatType > getFloatImage( final int ti } @Override - public default Dimensions getImageSize( final int timepointId ) + default Dimensions getImageSize( final int timepointId ) { return getImageSize( timepointId, 0 ); } @@ -135,5 +135,5 @@ public default Dimensions getImageSize( final int timepointId ) * resolution level for which to retrieve the image size. * @return the image size, or null if it could not be determined. */ - public Dimensions getImageSize( final int timepointId, final int level ); + Dimensions getImageSize( int timepointId, int level ); } diff --git a/src/main/java/mpicbg/spim/data/sequence/SetupImgLoader.java b/src/main/java/mpicbg/spim/data/sequence/SetupImgLoader.java index e51f405..c6b0110 100644 --- a/src/main/java/mpicbg/spim/data/sequence/SetupImgLoader.java +++ b/src/main/java/mpicbg/spim/data/sequence/SetupImgLoader.java @@ -58,7 +58,7 @@ public interface SetupImgLoader< T > extends BasicSetupImgLoader< T > * optional hints regarding how to load the image. * @return {@link FloatType} image */ - public RandomAccessibleInterval< FloatType > getFloatImage( final int timepointId, boolean normalize, ImgLoaderHint... hints ); + RandomAccessibleInterval< FloatType > getFloatImage( int timepointId, boolean normalize, ImgLoaderHint... hints ); /** * Get the size of an image. If possible, load only the meta-data for the @@ -69,7 +69,7 @@ public interface SetupImgLoader< T > extends BasicSetupImgLoader< T > * timepoint for which to retrieve the image size. * @return the image size, or null if it could not be determined. */ - public Dimensions getImageSize( final int timepointId ); + Dimensions getImageSize( int timepointId ); /** * Get the voxel size of an image. If possible, load only the meta-data for @@ -81,5 +81,5 @@ public interface SetupImgLoader< T > extends BasicSetupImgLoader< T > * timepoint for which to retrieve the voxel size. * @return the voxel size, or null if it could not be determined. */ - public VoxelDimensions getVoxelSize( final int timepointId ); + VoxelDimensions getVoxelSize( int timepointId ); }