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, 13 insertions, 14 deletions

diff --git a/java/test/TestH5Pvirtual.java b/java/test/TestH5Pvirtual.java
index 4c9a763..0478356 100644
--- a/java/test/TestH5Pvirtual.java
+++ b/java/test/TestH5Pvirtual.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     *
@@ -52,13 +51,13 @@ public class TestH5Pvirtual {
     private static final int fill_value = -1;
     long[] H5dims = { DIM_Y };
     long[] VDSH5dims = { VDSDIM_X, VDSDIM_Y };
-    long H5fid = -1;
-    long H5dsid = -1;
-    long H5dssid = -1;
-    long H5dvsid = -1;
-    long H5did = -1;
-    long H5dcplid = -1;
-    long H5dapl_id = -1;
+    long H5fid = HDF5Constants.H5I_INVALID_HID;
+    long H5dsid = HDF5Constants.H5I_INVALID_HID;
+    long H5dssid = HDF5Constants.H5I_INVALID_HID;
+    long H5dvsid = HDF5Constants.H5I_INVALID_HID;
+    long H5did = HDF5Constants.H5I_INVALID_HID;
+    long H5dcplid = HDF5Constants.H5I_INVALID_HID;
+    long H5dapl_id = HDF5Constants.H5I_INVALID_HID;
 
     private final void _deleteFile(String filename) {
         File file = new File(filename);
@@ -69,8 +68,8 @@ public class TestH5Pvirtual {
     }
 
     private final long _createDataset(long fid, long dsid, String name, long dcpl, long dapl) {
-        long did = -1;
-        long space_id = -1;
+        long did = HDF5Constants.H5I_INVALID_HID;
+        long space_id = HDF5Constants.H5I_INVALID_HID;
         long[] start = {0, 0};
         long[] stride = null;
         long[] count = {1, 1};
@@ -100,9 +99,9 @@ public class TestH5Pvirtual {
         int[] dset_data = new int[DIM_Y];
         // Create source files and datasets
         for (int i=0; i < 3; i++) {
-            long space_id = -1;
-            long dset_id = -1;
-            long file_id = -1;
+            long space_id = HDF5Constants.H5I_INVALID_HID;
+            long dset_id = HDF5Constants.H5I_INVALID_HID;
+            long file_id = HDF5Constants.H5I_INVALID_HID;
             for (int j = 0; j < DIM_Y; j++) dset_data[j] = i+1;
 
             try {
@@ -265,7 +264,7 @@ public class TestH5Pvirtual {
 
     @Test
     public void testH5Pget_selection_source_dataset() throws Throwable {
-        long src_space = -1;
+        long src_space = HDF5Constants.H5I_INVALID_HID;
         long src_selection = -1;
 
         H5did = _createDataset(H5fid, H5dsid, "VDS", H5dcplid, H5dapl_id);