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, 26 insertions, 27 deletions

diff --git a/java/test/TestH5VL.java b/java/test/TestH5VL.java
index 554c1f7..4253d20 100644
--- a/java/test/TestH5VL.java
+++ b/java/test/TestH5VL.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     *
@@ -72,28 +71,28 @@ public class TestH5VL {
 
     @Test
     public void testH5VLget_connector_id() {
-    	String H5_FILE = "testFvl.h5";
+        String H5_FILE = "testFvl.h5";
 
         long H5fid = H5.H5Fcreate(H5_FILE, HDF5Constants.H5F_ACC_TRUNC,
                 HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
 
-    	try {
-    		long native_id = H5.H5VLget_connector_id(H5fid);
-    		assertTrue("H5.H5VLget_connector_id", native_id >= 0);
-
-    		/*
-    		 * If HDF5_VOL_CONNECTOR is set, this might not be the
-    		 * native connector. Only check for the native connector
-    		 * if this isn't set.
-    		 */
-    		String connector = System.getenv("HDF5_VOL_CONNECTOR");
-    		if (connector == null)
-    			assertEquals(HDF5Constants.H5VL_NATIVE, native_id);
-    	}
-    	catch (Throwable err) {
-    		err.printStackTrace();
-    		fail("H5.H5VLget_connector_id " + err);
-    	}
+        try {
+            long native_id = H5.H5VLget_connector_id(H5fid);
+            assertTrue("H5.H5VLget_connector_id", native_id >= 0);
+
+            /*
+             * If HDF5_VOL_CONNECTOR is set, this might not be the
+             * native connector. Only check for the native connector
+             * if this isn't set.
+             */
+            String connector = System.getenv("HDF5_VOL_CONNECTOR");
+            if (connector == null)
+                assertEquals(HDF5Constants.H5VL_NATIVE, native_id);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("H5.H5VLget_connector_id " + err);
+        }
         finally {
             if (H5fid > 0) {
                 try {H5.H5Fclose(H5fid);} catch (Exception ex) {}
@@ -139,14 +138,14 @@ public class TestH5VL {
         try {
             String native_name = H5.H5VLget_connector_name(H5fid);
 
-    		/*
-    		 * If HDF5_VOL_CONNECTOR is set, this might not be the
-    		 * native connector. Only check for the native connector
-    		 * if this isn't set.
-    		 */
-    		String connector = System.getenv("HDF5_VOL_CONNECTOR");
-    		if (connector == null)
-    			assertTrue("H5.H5VLget_connector_name H5VL_NATIVE", native_name.compareToIgnoreCase(HDF5Constants.H5VL_NATIVE_NAME)==0);
+            /*
+             * If HDF5_VOL_CONNECTOR is set, this might not be the
+             * native connector. Only check for the native connector
+             * if this isn't set.
+             */
+            String connector = System.getenv("HDF5_VOL_CONNECTOR");
+            if (connector == null)
+                assertTrue("H5.H5VLget_connector_name H5VL_NATIVE", native_name.compareToIgnoreCase(HDF5Constants.H5VL_NATIVE_NAME)==0);
         }
         catch (Throwable err) {
             err.printStackTrace();