From a72b7403ede44202777eccbcdd7b72be01a62b33 Mon Sep 17 00:00:00 2001 From: Tobias Pietzsch <tobias.pietzsch@gmail.com> Date: Sun, 2 Mar 2014 11:16:32 -0500 Subject: [PATCH] rename Hdf5CellCache to VolatileCellCache because it is not hdf5 specific --- src/main/java/bdv/img/cache/VolatileGlobalCellCache.java | 4 ++-- src/main/java/bdv/img/hdf5/Hdf5ImageLoader.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/bdv/img/cache/VolatileGlobalCellCache.java b/src/main/java/bdv/img/cache/VolatileGlobalCellCache.java index e94e6b35..a1a38632 100644 --- a/src/main/java/bdv/img/cache/VolatileGlobalCellCache.java +++ b/src/main/java/bdv/img/cache/VolatileGlobalCellCache.java @@ -483,7 +483,7 @@ public class VolatileGlobalCellCache< A extends VolatileAccess > implements Cach stats.getIoTimeBudget().reset( partialBudget ); } - public class Hdf5CellCache implements CellCache< A > + public class VolatileCellCache implements CellCache< A > { private final int timepoint; @@ -493,7 +493,7 @@ public class VolatileGlobalCellCache< A extends VolatileAccess > implements Cach private final LoadingStrategy loadingStrategy; - public Hdf5CellCache( final int timepoint, final int setup, final int level, final LoadingStrategy strategy ) + public VolatileCellCache( final int timepoint, final int setup, final int level, final LoadingStrategy strategy ) { this.timepoint = timepoint; this.setup = setup; diff --git a/src/main/java/bdv/img/hdf5/Hdf5ImageLoader.java b/src/main/java/bdv/img/hdf5/Hdf5ImageLoader.java index 35b338a4..3ee33b85 100644 --- a/src/main/java/bdv/img/hdf5/Hdf5ImageLoader.java +++ b/src/main/java/bdv/img/hdf5/Hdf5ImageLoader.java @@ -364,7 +364,7 @@ public class Hdf5ImageLoader implements ViewerImgLoader final long[] dimensions = getImageDimension( view.getTimepointIndex(), view.getSetupIndex(), level ); final int[] cellDimensions = perSetupSubdivisions.get( view.getSetupIndex() )[ level ]; - final CellCache< VolatileShortArray > c = cache.new Hdf5CellCache( view.getTimepointIndex(), view.getSetupIndex(), level, loadingStrategy ); + final CellCache< VolatileShortArray > c = cache.new VolatileCellCache( view.getTimepointIndex(), view.getSetupIndex(), level, loadingStrategy ); final VolatileImgCells< VolatileShortArray > cells = new VolatileImgCells< VolatileShortArray >( c, 1, dimensions, cellDimensions ); final CellImg< T, VolatileShortArray, VolatileCell< VolatileShortArray > > img = new CellImg< T, VolatileShortArray, VolatileCell< VolatileShortArray > >( null, cells ); return img; -- GitLab