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

1 files changed, 15 insertions, 16 deletions

diff --git a/java/test/TestH5P.java b/java/test/TestH5P.java
index 786c330..3879128 100644
--- a/java/test/TestH5P.java
+++ b/java/test/TestH5P.java
@@ -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,20 +40,20 @@ public class TestH5P {
     private static final int DIM_X = 4;
     private static final int DIM_Y = 6;
     long[] H5dims = { DIM_X, DIM_Y };
-    long H5fid = -1;
-    long H5dsid = -1;
-    long H5did = -1;
-    long lapl_id = -1;
-    long fapl_id = -1;
-    long fcpl_id = -1;
-    long ocpl_id = -1;
-    long ocp_plist_id = -1;
-    long lcpl_id = -1;
-    long plapl_id = -1;
-    long plist_id = -1;
-    long gapl_id = -1;
-    long gcpl_id = -1;
-    long acpl_id = -1;
+    long H5fid = HDF5Constants.H5I_INVALID_HID;
+    long H5dsid = HDF5Constants.H5I_INVALID_HID;
+    long H5did = HDF5Constants.H5I_INVALID_HID;
+    long lapl_id = HDF5Constants.H5I_INVALID_HID;
+    long fapl_id = HDF5Constants.H5I_INVALID_HID;
+    long fcpl_id = HDF5Constants.H5I_INVALID_HID;
+    long ocpl_id = HDF5Constants.H5I_INVALID_HID;
+    long ocp_plist_id = HDF5Constants.H5I_INVALID_HID;
+    long lcpl_id = HDF5Constants.H5I_INVALID_HID;
+    long plapl_id = HDF5Constants.H5I_INVALID_HID;
+    long plist_id = HDF5Constants.H5I_INVALID_HID;
+    long gapl_id = HDF5Constants.H5I_INVALID_HID;
+    long gcpl_id = HDF5Constants.H5I_INVALID_HID;
+    long acpl_id = HDF5Constants.H5I_INVALID_HID;
 
     private final void _deleteFile(String filename) {
         File file = new File(filename);
@@ -65,7 +64,7 @@ public class TestH5P {
     }
 
     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,
                     HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, dapl);