Consistent argument naming

Author: tpietzsch

src/main/java/org/janelia/saalfeldlab/n5/shard/DatasetAccess.java

@@ -23,19 +23,19 @@
  */
 public interface DatasetAccess<T> {
 
-	DataBlock<T> readBlock(PositionValueAccess kva, long[] gridPosition) throws N5IOException;
+	DataBlock<T> readBlock(PositionValueAccess pva, long[] gridPosition) throws N5IOException;
 
-	void writeBlock(PositionValueAccess kva, DataBlock<T> dataBlock) throws N5IOException;
+	void writeBlock(PositionValueAccess pva, DataBlock<T> dataBlock) throws N5IOException;
 
-	boolean deleteBlock(PositionValueAccess kva, long[] gridPosition) throws N5IOException;
+	boolean deleteBlock(PositionValueAccess pva, long[] gridPosition) throws N5IOException;
 
 
-	List<DataBlock<T>> readBlocks(PositionValueAccess kva, List<long[]> positions) throws N5IOException;
+	List<DataBlock<T>> readBlocks(PositionValueAccess pva, List<long[]> positions) throws N5IOException;
 
-	void writeBlocks(PositionValueAccess kva, List<DataBlock<T>> blocks) throws N5IOException;
+	void writeBlocks(PositionValueAccess pva, List<DataBlock<T>> blocks) throws N5IOException;
 
 //	TODO:
-//	  boolean deleteBlocks(PositionValueAccess kva, List<long[]> positions) throws N5IOException;
+//	  boolean deleteBlocks(PositionValueAccess pva, List<long[]> positions) throws N5IOException;
 
 
 	/**
@@ -91,7 +91,6 @@ void writeRegion(
 			ExecutorService exec
 	) throws N5Exception, InterruptedException, ExecutionException;
 
-
 	NestedGrid getGrid();
 
 	/**
@@ -104,6 +103,7 @@ void writeRegion(
 	 * @param outerLevel of the outerLevel shard position to group by. must be in range {@code [1, NestedGrid.numLevels() - 1]}
 	 * @return map of outerLevel shard positions to inner level block positions
 	 */
+	// TODO: move to Nesting
 	static <T extends NestedPosition> Collection<List<T>> groupInnerPositions(final NestedGrid grid, final List<T> innerPositions, final int outerLevel)  {
 
 		if (outerLevel < 1 || outerLevel >= grid.numLevels())

src/main/java/org/janelia/saalfeldlab/n5/shard/DefaultDatasetAccess.java

@@ -35,9 +35,9 @@ public NestedGrid getGrid() {
 	}
 
 	@Override
-	public DataBlock<T> readBlock(final PositionValueAccess kva, final long[] gridPosition) throws N5IOException {
+	public DataBlock<T> readBlock(final PositionValueAccess pva, final long[] gridPosition) throws N5IOException {
 		final NestedPosition position = grid.nestedPosition(gridPosition);
-		return readBlockRecursive(kva.get(position.key()), position, grid.numLevels() - 1);
+		return readBlockRecursive(pva.get(position.key()), position, grid.numLevels() - 1);
 	}
 
 	private DataBlock<T> readBlockRecursive(
@@ -347,23 +347,23 @@ private ReadData writeRegionRecursive(
 	}
 
 	@Override
-	public boolean deleteBlock(final PositionValueAccess kva, final long[] gridPosition) throws N5IOException {
+	public boolean deleteBlock(final PositionValueAccess pva, final long[] gridPosition) throws N5IOException {
 		final NestedPosition position = grid.nestedPosition(gridPosition);
 		final long[] key = position.key();
 		if (grid.numLevels() == 1) {
 			// for non-sharded dataset, don't bother getting the value, just remove the key.
 			try {
-				return kva.remove(key);
+				return pva.remove(key);
 			} catch (final Exception e) {
 				throw new N5Exception("The shard at " + Arrays.toString(key) + " could not be deleted.", e);
 			}
 		} else {
-			final ReadData existingData = kva.get(key);
+			final ReadData existingData = pva.get(key);
 			final ReadData modifiedData = deleteBlockRecursive(existingData, position, grid.numLevels() - 1);
 			if (existingData != null && modifiedData == null) {
-				return kva.remove(key);
+				return pva.remove(key);
 			} else if (modifiedData != existingData) {
-				kva.put(key, modifiedData);
+				pva.put(key, modifiedData);
 				return true;
 			} else {
 				return false;