Merge branch 'develop' into feature/coding_standardsfeature/coding_standards

1 files changed, 22 insertions, 23 deletions

diff --git a/java/test/TestH5Plist.java b/java/test/TestH5Plist.java
index e318cc9..03e1c8f 100644
--- a/java/test/TestH5Plist.java
+++ b/java/test/TestH5Plist.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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -85,7 +84,7 @@ public class TestH5Plist {
             PROP3_NAME,
             PROP4_NAME};
 
-    long plist_class_id = -1;
+    long plist_class_id = HDF5Constants.H5I_INVALID_HID;
 
     @Before
     public void createPropClass()throws NullPointerException, HDF5Exception
@@ -114,9 +113,9 @@ public class TestH5Plist {
     @Test
     public void testH5P_genprop_basic_class() {
         int         status = -1;
-        long        cid1 = -1;        // Generic Property class ID
-        long        cid2 = -1;        // Generic Property class ID
-        long        cid3 = -1;        // Generic Property class ID
+        long        cid1 = HDF5Constants.H5I_INVALID_HID;        // Generic Property class ID
+        long        cid2 = HDF5Constants.H5I_INVALID_HID;        // Generic Property class ID
+        long        cid3 = HDF5Constants.H5I_INVALID_HID;        // Generic Property class ID
         String      name = null;       // Name of class
 
         try {
@@ -149,7 +148,7 @@ public class TestH5Plist {
             }
             assertTrue("H5Pequal cid2", status >= 0);
 
-            // Make certain false postives aren't being returned
+            // Make certain false positives aren't being returned
             try {
                 status = H5.H5Pequal(cid2, HDF5Constants.H5P_FILE_CREATE);
             }
@@ -162,7 +161,7 @@ public class TestH5Plist {
             // Close parent class
             try {
                 H5.H5Pclose_class(cid2);
-                cid2 = -1;
+                cid2 = HDF5Constants.H5I_INVALID_HID;
             }
             catch (Throwable err) {
                 err.printStackTrace();
@@ -172,7 +171,7 @@ public class TestH5Plist {
             // Close class
             try {
                 H5.H5Pclose_class(plist_class_id);
-                plist_class_id = -1;
+                plist_class_id = HDF5Constants.H5I_INVALID_HID;
             }
             catch (Throwable err) {
                 err.printStackTrace();
@@ -242,7 +241,7 @@ public class TestH5Plist {
             // Close parent class's parent
             try {
                 H5.H5Pclose_class(cid3);
-                cid3 = -1;
+                cid3 = HDF5Constants.H5I_INVALID_HID;
             }
             catch (Throwable err) {
                 err.printStackTrace();
@@ -252,7 +251,7 @@ public class TestH5Plist {
             // Close parent class's parent
             try {
                 H5.H5Pclose_class(cid2);
-                cid2 = -1;
+                cid2 = HDF5Constants.H5I_INVALID_HID;
             }
             catch (Throwable err) {
                 err.printStackTrace();
@@ -262,7 +261,7 @@ public class TestH5Plist {
             // Close parent class's parent
             try {
                 H5.H5Pclose_class(cid1);
-                cid1 = -1;
+                cid1 = HDF5Constants.H5I_INVALID_HID;
             }
             catch (Throwable err) {
                 err.printStackTrace();
@@ -296,7 +295,7 @@ public class TestH5Plist {
         }
         assertTrue("H5Pget_nprops: "+nprops, nprops==0);
 
-        // Check the existance of the first property (should fail)
+        // Check the existence of the first property (should fail)
         try {
             status = H5.H5Pexist(plist_class_id, PROP1_NAME);
         }
@@ -327,7 +326,7 @@ public class TestH5Plist {
         catch (Throwable err) {
         }
 
-        // Check the existance of the first property
+        // Check the existence of the first property
         try {
             status = H5.H5Pexist(plist_class_id, PROP1_NAME);
         }
@@ -378,7 +377,7 @@ public class TestH5Plist {
         catch (Throwable err) {
         }
 
-        // Check the existance of the second property
+        // Check the existence of the second property
         try {
             status = H5.H5Pexist(plist_class_id, PROP2_NAME);
         }
@@ -419,7 +418,7 @@ public class TestH5Plist {
             fail("H5Pregister2 plist_class_id: "+PROP3_NAME + err);
         }
 
-        // Check the existance of the third property
+        // Check the existence of the third property
         try {
             status = H5.H5Pexist(plist_class_id, PROP3_NAME);
         }
@@ -634,7 +633,7 @@ public class TestH5Plist {
     @Test
     public void testH5P_genprop_basic_list_prop() {
         boolean     status = false;
-        long        lid1 = -1;        // Generic Property list ID
+        long        lid1 = HDF5Constants.H5I_INVALID_HID;        // Generic Property list ID
         long        nprops = -1;      // Number of properties in class
 
         try {
@@ -760,7 +759,7 @@ public class TestH5Plist {
 //    @Test
 //    public void testH5P_genprop_class_callback() {
 //        class cdata {
-//            public long cls_id = -1;
+//            public long cls_id = HDF5Constants.H5I_INVALID_HID;
 //            public int cls_count = -1;
 //            cdata(long id, int count) {
 //                this.cls_id = id;
@@ -813,11 +812,11 @@ public class TestH5Plist {
 //        }
 //        H5P_cls_close_func_cb cls_close_cb = new H5P_cls_close_callback();
 //
-//        long    cid1 = -1;        // Generic Property class ID
-//        long    cid2 = -1;        // Generic Property class ID
-//        long    lid1 = -1;        // Generic Property list ID
-//        long    lid2 = -1;        // Generic Property list ID
-//        long    lid3 = -1;        // Generic Property list ID
+//        long    cid1 = HDF5Constants.H5I_INVALID_HID;        // Generic Property class ID
+//        long    cid2 = HDF5Constants.H5I_INVALID_HID;        // Generic Property class ID
+//        long    lid1 = HDF5Constants.H5I_INVALID_HID;        // Generic Property list ID
+//        long    lid2 = HDF5Constants.H5I_INVALID_HID;        // Generic Property list ID
+//        long    lid3 = HDF5Constants.H5I_INVALID_HID;        // Generic Property list ID
 //        long    nprops = -1;    // Number of properties in class
 //
 //        try {