Squashed commit of the token_refactoring branch:

This commit is contained in:
Dana Robinson
2020-01-16 13:29:34 -08:00
parent dbb0ccc31d
commit 2b1709f6ff
225 changed files with 14022 additions and 4695 deletions

View File

@@ -22,8 +22,8 @@ import java.util.ArrayList;
import hdf.hdf5lib.H5;
import hdf.hdf5lib.HDF5Constants;
import hdf.hdf5lib.callbacks.H5L_iterate_cb;
import hdf.hdf5lib.callbacks.H5L_iterate_t;
import hdf.hdf5lib.callbacks.H5L_iterate_opdata_t;
import hdf.hdf5lib.exceptions.HDF5Exception;
import hdf.hdf5lib.exceptions.HDF5LibraryException;
import hdf.hdf5lib.structs.H5L_info_t;
@@ -320,9 +320,9 @@ public class TestH5Lcreate {
err.printStackTrace();
fail("H5.H5Lget_info: " + err);
}
assertFalse("H5Lget_info ", link_info==null);
assertFalse("H5Lget_info", link_info==null);
assertTrue("H5Lget_info link type", link_info.type==HDF5Constants.H5L_TYPE_SOFT);
assertTrue("Link Address ", link_info.address_val_size>0);
assertTrue("Link Value Size", link_info.val_size > 0);
}
@Test
@@ -383,9 +383,9 @@ public class TestH5Lcreate {
err.printStackTrace();
fail("H5.H5Lget_info: " + err);
}
assertFalse("H5Lget_info ", link_info==null);
assertFalse("H5Lget_info", link_info==null);
assertTrue("H5Lget_info link type", link_info.type==HDF5Constants.H5L_TYPE_SOFT);
assertTrue("Link Address ", link_info.address_val_size>0);
assertTrue("Link Value Size", link_info.val_size > 0);
}
@Test
@@ -431,9 +431,9 @@ public class TestH5Lcreate {
err.printStackTrace();
fail("H5.H5Lget_info: " + err);
}
assertFalse("H5Lget_info ", link_info==null);
assertFalse("H5Lget_info", link_info==null);
assertTrue("H5Lget_info link type", link_info.type==HDF5Constants.H5L_TYPE_EXTERNAL);
assertTrue("Link Address ", link_info.address_val_size>0);
assertTrue("Link Value Size", link_info.val_size > 0);
}
@Test
@@ -740,18 +740,18 @@ public class TestH5Lcreate {
this.link_type = type;
}
}
class H5L_iter_data implements H5L_iterate_t {
class H5L_iter_data implements H5L_iterate_opdata_t {
public ArrayList<idata> iterdata = new ArrayList<idata>();
}
H5L_iterate_t iter_data = new H5L_iter_data();
class H5L_iter_callback implements H5L_iterate_cb {
public int callback(long group, String name, H5L_info_t info, H5L_iterate_t op_data) {
H5L_iterate_opdata_t iter_data = new H5L_iter_data();
class H5L_iter_callback implements H5L_iterate_t {
public int callback(long group, String name, H5L_info_t info, H5L_iterate_opdata_t op_data) {
idata id = new idata(name, info.type);
((H5L_iter_data)op_data).iterdata.add(id);
return 0;
}
}
H5L_iterate_cb iter_cb = new H5L_iter_callback();
H5L_iterate_t iter_cb = new H5L_iter_callback();
try {
H5.H5Lvisit(H5fid, HDF5Constants.H5_INDEX_CRT_ORDER, HDF5Constants.H5_ITER_INC, iter_cb, iter_data);
}
@@ -792,18 +792,18 @@ public class TestH5Lcreate {
this.link_type = type;
}
}
class H5L_iter_data implements H5L_iterate_t {
class H5L_iter_data implements H5L_iterate_opdata_t {
public ArrayList<idata> iterdata = new ArrayList<idata>();
}
H5L_iterate_t iter_data = new H5L_iter_data();
class H5L_iter_callback implements H5L_iterate_cb {
public int callback(long group, String name, H5L_info_t info, H5L_iterate_t op_data) {
H5L_iterate_opdata_t iter_data = new H5L_iter_data();
class H5L_iter_callback implements H5L_iterate_t {
public int callback(long group, String name, H5L_info_t info, H5L_iterate_opdata_t op_data) {
idata id = new idata(name, info.type);
((H5L_iter_data)op_data).iterdata.add(id);
return 0;
}
}
H5L_iterate_cb iter_cb = new H5L_iter_callback();
H5L_iterate_t iter_cb = new H5L_iter_callback();
try {
H5.H5Literate(H5fid, HDF5Constants.H5_INDEX_CRT_ORDER, HDF5Constants.H5_ITER_INC, 0, iter_cb, iter_data);
}