1 12 merge java copyright header changes (#391)
* OESS-98 fix tools test for plugins * sync fork * Merge of changes from dev * Move problem option to bottom of the list until fixed * HDFFV-11106 - fix parsing optional args * HDFFV-11106 add note * grammer fix * Whitespace after clang formatting * Undo format version 11 changes * Update check to working version * Merge workflow and minor changes from develop * Update supported platforms * PR#3 merge from develop * Merge gcc 10 diagnostics option from develop * Merge #318 OSX changes from develop * Merge serval small changes from dev * fix typo * Minor non-space formatting changes * GH #386 copyright corrections for java folder * revert because logic requires false return
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
* Copyright by The HDF Group. *
|
||||
* Copyright by the Board of Trustees of the University of Illinois. *
|
||||
* All rights reserved. *
|
||||
* *
|
||||
* This file is part of HDF5. The full HDF5 copyright notice, including *
|
||||
@@ -41,13 +40,13 @@ public class TestH5Ocreate {
|
||||
private static final String H5_FILE = "testO.h5";
|
||||
private static final int DIM_X = 4;
|
||||
private static final int DIM_Y = 6;
|
||||
long H5fcpl = -1;
|
||||
long H5fid = -1;
|
||||
long H5dsid = -1;
|
||||
long H5did1 = -1;
|
||||
long H5did2 = -1;
|
||||
long H5gcpl = -1;
|
||||
long H5gid = -1;
|
||||
long H5fcpl = HDF5Constants.H5I_INVALID_HID;
|
||||
long H5fid = HDF5Constants.H5I_INVALID_HID;
|
||||
long H5dsid = HDF5Constants.H5I_INVALID_HID;
|
||||
long H5did1 = HDF5Constants.H5I_INVALID_HID;
|
||||
long H5did2 = HDF5Constants.H5I_INVALID_HID;
|
||||
long H5gcpl = HDF5Constants.H5I_INVALID_HID;
|
||||
long H5gid = HDF5Constants.H5I_INVALID_HID;
|
||||
long[] H5dims = { DIM_X, DIM_Y };
|
||||
|
||||
private final void _deleteFile(String filename) {
|
||||
@@ -64,7 +63,7 @@ public class TestH5Ocreate {
|
||||
}
|
||||
|
||||
private final long _createDataset(long fid, long dsid, String name, long dapl) {
|
||||
long did = -1;
|
||||
long did = HDF5Constants.H5I_INVALID_HID;
|
||||
try {
|
||||
did = H5.H5Dcreate(fid, name,
|
||||
HDF5Constants.H5T_STD_I32BE, dsid,
|
||||
@@ -80,7 +79,7 @@ public class TestH5Ocreate {
|
||||
}
|
||||
|
||||
private final long _createGroup(long fid, String name) {
|
||||
long gid = -1;
|
||||
long gid = HDF5Constants.H5I_INVALID_HID;
|
||||
try {
|
||||
H5gcpl = HDF5Constants.H5P_DEFAULT;
|
||||
gid = H5.H5Gcreate(fid, name, HDF5Constants.H5P_DEFAULT,
|
||||
@@ -293,7 +292,7 @@ public class TestH5Ocreate {
|
||||
|
||||
@Test
|
||||
public void testH5Olink() {
|
||||
long oid = -1;
|
||||
long oid = HDF5Constants.H5I_INVALID_HID;
|
||||
H5O_info_t obj_info = null;
|
||||
H5O_info_t dst_obj_info = null;
|
||||
try {
|
||||
@@ -380,7 +379,7 @@ public class TestH5Ocreate {
|
||||
|
||||
@Test
|
||||
public void testH5Ocomment() {
|
||||
long oid = -1;
|
||||
long oid = HDF5Constants.H5I_INVALID_HID;
|
||||
String obj_comment = null;
|
||||
try {
|
||||
oid = H5.H5Oopen(H5fid, "DS1", HDF5Constants.H5P_DEFAULT);
|
||||
@@ -405,7 +404,7 @@ public class TestH5Ocreate {
|
||||
|
||||
@Test
|
||||
public void testH5Ocomment_clear() {
|
||||
long oid = -1;
|
||||
long oid = HDF5Constants.H5I_INVALID_HID;
|
||||
String obj_comment = null;
|
||||
try {
|
||||
oid = H5.H5Oopen(H5fid, "DS1", HDF5Constants.H5P_DEFAULT);
|
||||
@@ -506,7 +505,7 @@ public class TestH5Ocreate {
|
||||
|
||||
@Test
|
||||
public void testH5Oinc_dec_count() {
|
||||
long oid = -1;
|
||||
long oid = HDF5Constants.H5I_INVALID_HID;
|
||||
H5O_info_t obj_info = null;
|
||||
try {
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user