Merge branch 'develop' into feature/coding_standardsfeature/coding_standards

1 files changed, 11 insertions, 12 deletions

diff --git a/java/examples/groups/H5Ex_G_Intermediate.java b/java/examples/groups/H5Ex_G_Intermediate.java
index f7d5a50..ad0290c 100644
--- a/java/examples/groups/H5Ex_G_Intermediate.java
+++ b/java/examples/groups/H5Ex_G_Intermediate.java
@@ -1,12 +1,11 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * 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     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -19,8 +18,8 @@ package examples.groups;
 
 import hdf.hdf5lib.H5;
 import hdf.hdf5lib.HDF5Constants;
-import hdf.hdf5lib.callbacks.H5O_iterate_cb;
 import hdf.hdf5lib.callbacks.H5O_iterate_t;
+import hdf.hdf5lib.callbacks.H5O_iterate_opdata_t;
 import hdf.hdf5lib.structs.H5O_info_t;
 
 import java.util.ArrayList;
@@ -31,9 +30,9 @@ public class H5Ex_G_Intermediate {
 
     private void CreateGroup() throws Exception {
 
-        long file_id = -1;
-        long group_id = -1;
-        long gcpl_id = -1;
+        long file_id = HDF5Constants.H5I_INVALID_HID;
+        long group_id = HDF5Constants.H5I_INVALID_HID;
+        long gcpl_id = HDF5Constants.H5I_INVALID_HID;
 
         try {
             // Create a new file_id using the default properties.
@@ -53,9 +52,9 @@ public class H5Ex_G_Intermediate {
             // Print all the objects in the file_ids to show that intermediate group_ids have been created.
             System.out.println("Objects in the file_id:");
 
-            // H5O_iterate_t iter_data = null;
-            H5O_iterate_t iter_data = new H5O_iter_data();
-            H5O_iterate_cb iter_cb = new H5O_iter_callback();
+            // H5O_iterate_opdata_t iter_data = null;
+            H5O_iterate_opdata_t iter_data = new H5O_iter_data();
+            H5O_iterate_t iter_cb = new H5O_iter_callback();
 
             H5.H5Ovisit(file_id, HDF5Constants.H5_INDEX_NAME, HDF5Constants.H5_ITER_NATIVE, iter_cb, iter_data);
         }
@@ -92,12 +91,12 @@ public class H5Ex_G_Intermediate {
         }
     }
 
-    private class H5O_iter_data implements H5O_iterate_t {
+    private class H5O_iter_data implements H5O_iterate_opdata_t {
         public ArrayList<idata> iterdata = new ArrayList<idata>();
     }
 
-    private class H5O_iter_callback implements H5O_iterate_cb {
-        public int callback(long group, String name, H5O_info_t info, H5O_iterate_t op_data) {
+    private class H5O_iter_callback implements H5O_iterate_t {
+        public int callback(long group, String name, H5O_info_t info, H5O_iterate_opdata_t op_data) {
             idata id = new idata(name, info.type);
             ((H5O_iter_data) op_data).iterdata.add(id);