[med-svn] [Git][med-team/libsis-jhdf5-java][upstream] New upstream version 19.04.1+dfsg
Pierre Gruet (@pgt)
gitlab at salsa.debian.org
Sat Jul 30 14:01:06 BST 2022
Pierre Gruet pushed to branch upstream at Debian Med / libsis-jhdf5-java
Commits:
f93b3ece by Pierre Gruet at 2022-07-30T13:55:33+02:00
New upstream version 19.04.1+dfsg
- - - - -
19 changed files:
- build.gradle
- + source/c/centos7build.README
- source/c/compile_hdf5_gcc.sh
- + source/c/compile_hdf5_macosx_aarch64.sh
- + source/c/compile_macosx_aarch64.sh
- source/java/ch/systemsx/cisd/hdf5/HDF5BaseWriter.java
- source/java/ch/systemsx/cisd/hdf5/HDF5ByteWriter.java
- source/java/ch/systemsx/cisd/hdf5/HDF5DoubleWriter.java
- source/java/ch/systemsx/cisd/hdf5/HDF5FloatWriter.java
- source/java/ch/systemsx/cisd/hdf5/HDF5IntWriter.java
- source/java/ch/systemsx/cisd/hdf5/HDF5LongWriter.java
- source/java/ch/systemsx/cisd/hdf5/HDF5ShortWriter.java
- source/java/ch/systemsx/cisd/hdf5/HDF5UnsignedByteWriter.java
- source/java/ch/systemsx/cisd/hdf5/HDF5UnsignedIntWriter.java
- source/java/ch/systemsx/cisd/hdf5/HDF5UnsignedLongWriter.java
- source/java/ch/systemsx/cisd/hdf5/HDF5UnsignedShortWriter.java
- sourceTest/java/ch/systemsx/cisd/hdf5/io/HDF5DataSetRandomAccessFileTest.java
- sourceTest/java/ch/systemsx/cisd/hdf5/tools/HDF5PrimitiveWriter.java.templ
- sourceTest/java/ch/systemsx/cisd/hdf5/tools/HDF5UnsignedPrimitiveWriter.java.templ
Changes:
=====================================
build.gradle
=====================================
@@ -8,7 +8,7 @@ dependencies {
}
tasks.withType(Test) {
- systemProperty "java.library.path", "libs/native/jhdf5/amd64-Linux:libs/native/jhdf5/amd64-Linux:libs/native/jhdf5/x86_64-Mac OS X:libs/native/jhdf5/x86_64-Mac OS X"
+ systemProperty "java.library.path", "libs/native/jhdf5/amd64-Linux:libs/native/jhdf5/amd64-Linux:libs/native/jhdf5/x86_64-Mac OS X:libs/native/jhdf5/aarch64-Mac OS X:libs/native/jhdf5/x86_64-Mac OS X"
}
def execute(command, arguments) {
=====================================
source/c/centos7build.README
=====================================
@@ -0,0 +1,19 @@
+1. Install OpenJDK 1.8:
+ # yum install java-1.8.0-openjdk-headless.x86_64 java-1.8.0-openjdk-devel.x86_64
+
+2. Install devtoolset-7 from Scientific Linux:
+ # yum install centos-release-scl
+ # yum install devtoolset-7
+
+4. As build-user, enable devtoolset-7
+ $ scl enable devtoolset-7 bash
+
+5. Build HDF5:
+ $ ./compile_hdf5_linux_amd64.sh
+
+6. Build JHDF5:
+ $ ./compile_linux_amd64.sh
+
+7. If the build runs successful, you will find the file build/libjhdf5.so
+
+8. Copy build/libjhdf5.so to the Linux workspace folder libs/native/jhdf5/amd64-Linux/libjhdf5.so
=====================================
source/c/compile_hdf5_gcc.sh
=====================================
@@ -4,9 +4,9 @@ source version.sh
PLATFORM="$1"
PATCHES="$2"
-if [ "$PLATFORM" != "i386" -a "$PLATFORM" != "x86" -a "$PLATFORM" != "amd64" -a "$PLATFORM" != "x86_64" -a "$PLATFORM" != "armv6l" ]; then
+if [ "$PLATFORM" != "i386" -a "$PLATFORM" != "x86" -a "$PLATFORM" != "amd64" -a "$PLATFORM" != "x86_64" -a "$PLATFORM" != "armv6l" -a "$PLATFORM" != "aarch64" ]; then
echo "Syntax: compile_hdf5.sh <platform>"
- echo "where <platform> is one of i386, x86, amd64, x86_64, or armv6l"
+ echo "where <platform> is one of i386, x86, amd64, x86_64, aarch64, or armv6l"
exit 1
fi
=====================================
source/c/compile_hdf5_macosx_aarch64.sh
=====================================
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+CFLAGS='-Wno-error=implicit-function-declaration -m64 -mmacosx-version-min=10.11' ./compile_hdf5_gcc.sh aarch64
=====================================
source/c/compile_macosx_aarch64.sh
=====================================
@@ -0,0 +1,31 @@
+#! /bin/bash
+
+source version.sh
+
+if [ -n "$POSTFIX" ]; then
+ VERSION="$VERSION-$POSTFIX"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ JAVA_HOME=`java -XshowSettings:properties -version 2>&1 | grep "java.home" | cut -d"=" -f2`
+fi
+
+rm -fR build/jni
+rm -f build/libjhdf5.jnilib
+cp -a jni build/
+cp -a *.c build/jni/
+cd build
+cp hdf5-$VERSION/src/H5win32defs.h jni/
+cp hdf5-$VERSION/src/H5private.h jni/
+
+echo "JHDF5 building..."
+pwd
+gcc -Wno-error=implicit-function-declaration -m64 -mmacosx-version-min=10.11 -dynamiclib -O3 jni/*.c -Ihdf5-${VERSION}-aarch64/include -I${JAVA_HOME}/include hdf5-${VERSION}-aarch64/lib/libhdf5.a -o libjhdf5.jnilib -lz &> jhdf5_build.log
+
+if [ -f libjhdf5.jnilib ]; then
+ cp -pf libjhdf5.jnilib "../../../libs/native/jhdf5/aarch64-Mac OS X"
+ echo "Build deployed"
+else
+ echo "ERROR"
+fi
+
=====================================
source/java/ch/systemsx/cisd/hdf5/HDF5BaseWriter.java
=====================================
@@ -1038,7 +1038,7 @@ final class HDF5BaseWriter extends HDF5BaseReader
*/
HDF5DataSet createDataSet(final String objectPath, final long storageDataTypeId,
final HDF5AbstractStorageFeatures features, final long[] dimensions,
- final long[] chunkSizeOrNull, int elementLength)
+ final long[] chunkSizeOrNull, final int elementLength)
{
final ICallableWithCleanUp<HDF5DataSet> openDataSetCallable =
new ICallableWithCleanUp<HDF5DataSet>()
=====================================
source/java/ch/systemsx/cisd/hdf5/HDF5ByteWriter.java
=====================================
@@ -281,7 +281,7 @@ class HDF5ByteWriter extends HDF5ByteReader implements IHDF5ByteWriter
}
@Override
- public void createArray(String objectPath, HDF5DataSetTemplate template)
+ public void createArray(final String objectPath, final HDF5DataSetTemplate template)
{
assert objectPath != null;
@@ -659,7 +659,7 @@ class HDF5ByteWriter extends HDF5ByteReader implements IHDF5ByteWriter
}
@Override
- public void writeMDArray(String objectPath, MDByteArray data, HDF5DataSetTemplate template)
+ public void writeMDArray(final String objectPath, final MDByteArray data, final HDF5DataSetTemplate template)
{
assert data != null;
baseWriter.checkOpen();
@@ -787,7 +787,7 @@ class HDF5ByteWriter extends HDF5ByteReader implements IHDF5ByteWriter
}
@Override
- public void createMDArray(String objectPath, HDF5DataSetTemplate template)
+ public void createMDArray(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<Void> createRunnable = new ICallableWithCleanUp<Void>()
@@ -824,7 +824,7 @@ class HDF5ByteWriter extends HDF5ByteReader implements IHDF5ByteWriter
}
@Override
- public HDF5DataSet createMDArrayAndOpen(String objectPath, HDF5DataSetTemplate template)
+ public HDF5DataSet createMDArrayAndOpen(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<HDF5DataSet> createRunnable = new ICallableWithCleanUp<HDF5DataSet>()
=====================================
source/java/ch/systemsx/cisd/hdf5/HDF5DoubleWriter.java
=====================================
@@ -280,7 +280,7 @@ class HDF5DoubleWriter extends HDF5DoubleReader implements IHDF5DoubleWriter
}
@Override
- public void createArray(String objectPath, HDF5DataSetTemplate template)
+ public void createArray(final String objectPath, final HDF5DataSetTemplate template)
{
assert objectPath != null;
@@ -658,7 +658,7 @@ class HDF5DoubleWriter extends HDF5DoubleReader implements IHDF5DoubleWriter
}
@Override
- public void writeMDArray(String objectPath, MDDoubleArray data, HDF5DataSetTemplate template)
+ public void writeMDArray(final String objectPath, final MDDoubleArray data, final HDF5DataSetTemplate template)
{
assert data != null;
baseWriter.checkOpen();
@@ -786,7 +786,7 @@ class HDF5DoubleWriter extends HDF5DoubleReader implements IHDF5DoubleWriter
}
@Override
- public void createMDArray(String objectPath, HDF5DataSetTemplate template)
+ public void createMDArray(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<Void> createRunnable = new ICallableWithCleanUp<Void>()
@@ -823,7 +823,7 @@ class HDF5DoubleWriter extends HDF5DoubleReader implements IHDF5DoubleWriter
}
@Override
- public HDF5DataSet createMDArrayAndOpen(String objectPath, HDF5DataSetTemplate template)
+ public HDF5DataSet createMDArrayAndOpen(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<HDF5DataSet> createRunnable = new ICallableWithCleanUp<HDF5DataSet>()
=====================================
source/java/ch/systemsx/cisd/hdf5/HDF5FloatWriter.java
=====================================
@@ -280,7 +280,7 @@ class HDF5FloatWriter extends HDF5FloatReader implements IHDF5FloatWriter
}
@Override
- public void createArray(String objectPath, HDF5DataSetTemplate template)
+ public void createArray(final String objectPath, final HDF5DataSetTemplate template)
{
assert objectPath != null;
@@ -658,7 +658,7 @@ class HDF5FloatWriter extends HDF5FloatReader implements IHDF5FloatWriter
}
@Override
- public void writeMDArray(String objectPath, MDFloatArray data, HDF5DataSetTemplate template)
+ public void writeMDArray(final String objectPath, final MDFloatArray data, final HDF5DataSetTemplate template)
{
assert data != null;
baseWriter.checkOpen();
@@ -786,7 +786,7 @@ class HDF5FloatWriter extends HDF5FloatReader implements IHDF5FloatWriter
}
@Override
- public void createMDArray(String objectPath, HDF5DataSetTemplate template)
+ public void createMDArray(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<Void> createRunnable = new ICallableWithCleanUp<Void>()
@@ -823,7 +823,7 @@ class HDF5FloatWriter extends HDF5FloatReader implements IHDF5FloatWriter
}
@Override
- public HDF5DataSet createMDArrayAndOpen(String objectPath, HDF5DataSetTemplate template)
+ public HDF5DataSet createMDArrayAndOpen(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<HDF5DataSet> createRunnable = new ICallableWithCleanUp<HDF5DataSet>()
=====================================
source/java/ch/systemsx/cisd/hdf5/HDF5IntWriter.java
=====================================
@@ -281,7 +281,7 @@ class HDF5IntWriter extends HDF5IntReader implements IHDF5IntWriter
}
@Override
- public void createArray(String objectPath, HDF5DataSetTemplate template)
+ public void createArray(final String objectPath, final HDF5DataSetTemplate template)
{
assert objectPath != null;
@@ -659,7 +659,7 @@ class HDF5IntWriter extends HDF5IntReader implements IHDF5IntWriter
}
@Override
- public void writeMDArray(String objectPath, MDIntArray data, HDF5DataSetTemplate template)
+ public void writeMDArray(final String objectPath, final MDIntArray data, final HDF5DataSetTemplate template)
{
assert data != null;
baseWriter.checkOpen();
@@ -787,7 +787,7 @@ class HDF5IntWriter extends HDF5IntReader implements IHDF5IntWriter
}
@Override
- public void createMDArray(String objectPath, HDF5DataSetTemplate template)
+ public void createMDArray(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<Void> createRunnable = new ICallableWithCleanUp<Void>()
@@ -824,7 +824,7 @@ class HDF5IntWriter extends HDF5IntReader implements IHDF5IntWriter
}
@Override
- public HDF5DataSet createMDArrayAndOpen(String objectPath, HDF5DataSetTemplate template)
+ public HDF5DataSet createMDArrayAndOpen(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<HDF5DataSet> createRunnable = new ICallableWithCleanUp<HDF5DataSet>()
=====================================
source/java/ch/systemsx/cisd/hdf5/HDF5LongWriter.java
=====================================
@@ -281,7 +281,7 @@ class HDF5LongWriter extends HDF5LongReader implements IHDF5LongWriter
}
@Override
- public void createArray(String objectPath, HDF5DataSetTemplate template)
+ public void createArray(final String objectPath, final HDF5DataSetTemplate template)
{
assert objectPath != null;
@@ -659,7 +659,7 @@ class HDF5LongWriter extends HDF5LongReader implements IHDF5LongWriter
}
@Override
- public void writeMDArray(String objectPath, MDLongArray data, HDF5DataSetTemplate template)
+ public void writeMDArray(final String objectPath, final MDLongArray data, final HDF5DataSetTemplate template)
{
assert data != null;
baseWriter.checkOpen();
@@ -787,7 +787,7 @@ class HDF5LongWriter extends HDF5LongReader implements IHDF5LongWriter
}
@Override
- public void createMDArray(String objectPath, HDF5DataSetTemplate template)
+ public void createMDArray(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<Void> createRunnable = new ICallableWithCleanUp<Void>()
@@ -824,7 +824,7 @@ class HDF5LongWriter extends HDF5LongReader implements IHDF5LongWriter
}
@Override
- public HDF5DataSet createMDArrayAndOpen(String objectPath, HDF5DataSetTemplate template)
+ public HDF5DataSet createMDArrayAndOpen(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<HDF5DataSet> createRunnable = new ICallableWithCleanUp<HDF5DataSet>()
=====================================
source/java/ch/systemsx/cisd/hdf5/HDF5ShortWriter.java
=====================================
@@ -281,7 +281,7 @@ class HDF5ShortWriter extends HDF5ShortReader implements IHDF5ShortWriter
}
@Override
- public void createArray(String objectPath, HDF5DataSetTemplate template)
+ public void createArray(final String objectPath, final HDF5DataSetTemplate template)
{
assert objectPath != null;
@@ -659,7 +659,7 @@ class HDF5ShortWriter extends HDF5ShortReader implements IHDF5ShortWriter
}
@Override
- public void writeMDArray(String objectPath, MDShortArray data, HDF5DataSetTemplate template)
+ public void writeMDArray(final String objectPath, final MDShortArray data, final HDF5DataSetTemplate template)
{
assert data != null;
baseWriter.checkOpen();
@@ -787,7 +787,7 @@ class HDF5ShortWriter extends HDF5ShortReader implements IHDF5ShortWriter
}
@Override
- public void createMDArray(String objectPath, HDF5DataSetTemplate template)
+ public void createMDArray(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<Void> createRunnable = new ICallableWithCleanUp<Void>()
@@ -824,7 +824,7 @@ class HDF5ShortWriter extends HDF5ShortReader implements IHDF5ShortWriter
}
@Override
- public HDF5DataSet createMDArrayAndOpen(String objectPath, HDF5DataSetTemplate template)
+ public HDF5DataSet createMDArrayAndOpen(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<HDF5DataSet> createRunnable = new ICallableWithCleanUp<HDF5DataSet>()
=====================================
source/java/ch/systemsx/cisd/hdf5/HDF5UnsignedByteWriter.java
=====================================
@@ -280,7 +280,7 @@ class HDF5UnsignedByteWriter extends HDF5UnsignedByteReader implements IHDF5Byte
}
@Override
- public void createArray(String objectPath, HDF5DataSetTemplate template)
+ public void createArray(final String objectPath, final HDF5DataSetTemplate template)
{
assert objectPath != null;
@@ -658,7 +658,7 @@ class HDF5UnsignedByteWriter extends HDF5UnsignedByteReader implements IHDF5Byte
}
@Override
- public void writeMDArray(String objectPath, MDByteArray data, HDF5DataSetTemplate template)
+ public void writeMDArray(final String objectPath, final MDByteArray data, final HDF5DataSetTemplate template)
{
assert data != null;
baseWriter.checkOpen();
@@ -786,7 +786,7 @@ class HDF5UnsignedByteWriter extends HDF5UnsignedByteReader implements IHDF5Byte
}
@Override
- public void createMDArray(String objectPath, HDF5DataSetTemplate template)
+ public void createMDArray(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<Void> createRunnable = new ICallableWithCleanUp<Void>()
@@ -823,7 +823,7 @@ class HDF5UnsignedByteWriter extends HDF5UnsignedByteReader implements IHDF5Byte
}
@Override
- public HDF5DataSet createMDArrayAndOpen(String objectPath, HDF5DataSetTemplate template)
+ public HDF5DataSet createMDArrayAndOpen(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<HDF5DataSet> createRunnable = new ICallableWithCleanUp<HDF5DataSet>()
=====================================
source/java/ch/systemsx/cisd/hdf5/HDF5UnsignedIntWriter.java
=====================================
@@ -280,7 +280,7 @@ class HDF5UnsignedIntWriter extends HDF5UnsignedIntReader implements IHDF5IntWri
}
@Override
- public void createArray(String objectPath, HDF5DataSetTemplate template)
+ public void createArray(final String objectPath, final HDF5DataSetTemplate template)
{
assert objectPath != null;
@@ -658,7 +658,7 @@ class HDF5UnsignedIntWriter extends HDF5UnsignedIntReader implements IHDF5IntWri
}
@Override
- public void writeMDArray(String objectPath, MDIntArray data, HDF5DataSetTemplate template)
+ public void writeMDArray(final String objectPath, final MDIntArray data, final HDF5DataSetTemplate template)
{
assert data != null;
baseWriter.checkOpen();
@@ -786,7 +786,7 @@ class HDF5UnsignedIntWriter extends HDF5UnsignedIntReader implements IHDF5IntWri
}
@Override
- public void createMDArray(String objectPath, HDF5DataSetTemplate template)
+ public void createMDArray(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<Void> createRunnable = new ICallableWithCleanUp<Void>()
@@ -823,7 +823,7 @@ class HDF5UnsignedIntWriter extends HDF5UnsignedIntReader implements IHDF5IntWri
}
@Override
- public HDF5DataSet createMDArrayAndOpen(String objectPath, HDF5DataSetTemplate template)
+ public HDF5DataSet createMDArrayAndOpen(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<HDF5DataSet> createRunnable = new ICallableWithCleanUp<HDF5DataSet>()
=====================================
source/java/ch/systemsx/cisd/hdf5/HDF5UnsignedLongWriter.java
=====================================
@@ -280,7 +280,7 @@ class HDF5UnsignedLongWriter extends HDF5UnsignedLongReader implements IHDF5Long
}
@Override
- public void createArray(String objectPath, HDF5DataSetTemplate template)
+ public void createArray(final String objectPath, final HDF5DataSetTemplate template)
{
assert objectPath != null;
@@ -658,7 +658,7 @@ class HDF5UnsignedLongWriter extends HDF5UnsignedLongReader implements IHDF5Long
}
@Override
- public void writeMDArray(String objectPath, MDLongArray data, HDF5DataSetTemplate template)
+ public void writeMDArray(final String objectPath, final MDLongArray data, final HDF5DataSetTemplate template)
{
assert data != null;
baseWriter.checkOpen();
@@ -786,7 +786,7 @@ class HDF5UnsignedLongWriter extends HDF5UnsignedLongReader implements IHDF5Long
}
@Override
- public void createMDArray(String objectPath, HDF5DataSetTemplate template)
+ public void createMDArray(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<Void> createRunnable = new ICallableWithCleanUp<Void>()
@@ -823,7 +823,7 @@ class HDF5UnsignedLongWriter extends HDF5UnsignedLongReader implements IHDF5Long
}
@Override
- public HDF5DataSet createMDArrayAndOpen(String objectPath, HDF5DataSetTemplate template)
+ public HDF5DataSet createMDArrayAndOpen(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<HDF5DataSet> createRunnable = new ICallableWithCleanUp<HDF5DataSet>()
=====================================
source/java/ch/systemsx/cisd/hdf5/HDF5UnsignedShortWriter.java
=====================================
@@ -280,7 +280,7 @@ class HDF5UnsignedShortWriter extends HDF5UnsignedShortReader implements IHDF5Sh
}
@Override
- public void createArray(String objectPath, HDF5DataSetTemplate template)
+ public void createArray(final String objectPath, final HDF5DataSetTemplate template)
{
assert objectPath != null;
@@ -658,7 +658,7 @@ class HDF5UnsignedShortWriter extends HDF5UnsignedShortReader implements IHDF5Sh
}
@Override
- public void writeMDArray(String objectPath, MDShortArray data, HDF5DataSetTemplate template)
+ public void writeMDArray(final String objectPath, final MDShortArray data, final HDF5DataSetTemplate template)
{
assert data != null;
baseWriter.checkOpen();
@@ -786,7 +786,7 @@ class HDF5UnsignedShortWriter extends HDF5UnsignedShortReader implements IHDF5Sh
}
@Override
- public void createMDArray(String objectPath, HDF5DataSetTemplate template)
+ public void createMDArray(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<Void> createRunnable = new ICallableWithCleanUp<Void>()
@@ -823,7 +823,7 @@ class HDF5UnsignedShortWriter extends HDF5UnsignedShortReader implements IHDF5Sh
}
@Override
- public HDF5DataSet createMDArrayAndOpen(String objectPath, HDF5DataSetTemplate template)
+ public HDF5DataSet createMDArrayAndOpen(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<HDF5DataSet> createRunnable = new ICallableWithCleanUp<HDF5DataSet>()
=====================================
sourceTest/java/ch/systemsx/cisd/hdf5/io/HDF5DataSetRandomAccessFileTest.java
=====================================
@@ -465,6 +465,7 @@ public class HDF5DataSetRandomAccessFileTest
{
assertEquals(i, referenceArray[i], arrayRead[referenceArray.length + i]);
}
+ writer.close();
raFile.close();
}
@@ -504,6 +505,7 @@ public class HDF5DataSetRandomAccessFileTest
{
assertEquals(i, referenceArray[i], arrayRead[referenceArray.length + i]);
}
+ writer.close();
raFile.close();
}
=====================================
sourceTest/java/ch/systemsx/cisd/hdf5/tools/HDF5PrimitiveWriter.java.templ
=====================================
@@ -280,7 +280,7 @@ class HDF5__Name__Writer extends HDF5__Name__Reader implements IHDF5__Name__Writ
}
@Override
- public void createArray(String objectPath, HDF5DataSetTemplate template)
+ public void createArray(final String objectPath, final HDF5DataSetTemplate template)
{
assert objectPath != null;
@@ -658,7 +658,7 @@ class HDF5__Name__Writer extends HDF5__Name__Reader implements IHDF5__Name__Writ
}
@Override
- public void writeMDArray(String objectPath, MD__Name__Array data, HDF5DataSetTemplate template)
+ public void writeMDArray(final String objectPath, final MD__Name__Array data, final HDF5DataSetTemplate template)
{
assert data != null;
baseWriter.checkOpen();
@@ -786,7 +786,7 @@ class HDF5__Name__Writer extends HDF5__Name__Reader implements IHDF5__Name__Writ
}
@Override
- public void createMDArray(String objectPath, HDF5DataSetTemplate template)
+ public void createMDArray(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<Void> createRunnable = new ICallableWithCleanUp<Void>()
@@ -823,7 +823,7 @@ class HDF5__Name__Writer extends HDF5__Name__Reader implements IHDF5__Name__Writ
}
@Override
- public HDF5DataSet createMDArrayAndOpen(String objectPath, HDF5DataSetTemplate template)
+ public HDF5DataSet createMDArrayAndOpen(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<HDF5DataSet> createRunnable = new ICallableWithCleanUp<HDF5DataSet>()
=====================================
sourceTest/java/ch/systemsx/cisd/hdf5/tools/HDF5UnsignedPrimitiveWriter.java.templ
=====================================
@@ -280,7 +280,7 @@ class HDF5Unsigned__Name__Writer extends HDF5Unsigned__Name__Reader implements I
}
@Override
- public void createArray(String objectPath, HDF5DataSetTemplate template)
+ public void createArray(final String objectPath, final HDF5DataSetTemplate template)
{
assert objectPath != null;
@@ -658,7 +658,7 @@ class HDF5Unsigned__Name__Writer extends HDF5Unsigned__Name__Reader implements I
}
@Override
- public void writeMDArray(String objectPath, MD__Name__Array data, HDF5DataSetTemplate template)
+ public void writeMDArray(final String objectPath, final MD__Name__Array data, final HDF5DataSetTemplate template)
{
assert data != null;
baseWriter.checkOpen();
@@ -786,7 +786,7 @@ class HDF5Unsigned__Name__Writer extends HDF5Unsigned__Name__Reader implements I
}
@Override
- public void createMDArray(String objectPath, HDF5DataSetTemplate template)
+ public void createMDArray(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<Void> createRunnable = new ICallableWithCleanUp<Void>()
@@ -823,7 +823,7 @@ class HDF5Unsigned__Name__Writer extends HDF5Unsigned__Name__Reader implements I
}
@Override
- public HDF5DataSet createMDArrayAndOpen(String objectPath, HDF5DataSetTemplate template)
+ public HDF5DataSet createMDArrayAndOpen(final String objectPath, final HDF5DataSetTemplate template)
{
baseWriter.checkOpen();
final ICallableWithCleanUp<HDF5DataSet> createRunnable = new ICallableWithCleanUp<HDF5DataSet>()
View it on GitLab: https://salsa.debian.org/med-team/libsis-jhdf5-java/-/commit/f93b3ecebebddfba055dd88e81d48a5c3964f418
--
View it on GitLab: https://salsa.debian.org/med-team/libsis-jhdf5-java/-/commit/f93b3ecebebddfba055dd88e81d48a5c3964f418
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220730/b83a1221/attachment-0001.htm>
More information about the debian-med-commit
mailing list