Update to latest develop vesrsion (#346)

HDFGroup · Dec 18, 2024 · d5ac702 · d5ac702
1 parent c685959
commit d5ac702
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml
@@ -10,7 +10,7 @@ on:
         required: false
         default: check
   schedule:
-    - cron: "5 0 * * *"
+    - cron: "7 0 * * *"
 
 permissions:
   contents: read

diff --git a/src/org.hdfgroup.hdfview/hdf/view/TreeView/DefaultTreeView.java b/src/org.hdfgroup.hdfview/hdf/view/TreeView/DefaultTreeView.java
@@ -3334,15 +3334,15 @@ public void open()
             openShell.setImages(ViewProperties.getHdfIcons());
             openShell.setLayout(new GridLayout(1, true));
 
-            String[] lowValues  = {"Earliest", "V18", "V110", "V112", "V114", "V116", "Latest"};
+            String[] lowValues  = {"Earliest", "V18", "V110", "V112", "V114", "V200", "Latest"};
             int[] lowConstants  = {HDF5Constants.H5F_LIBVER_EARLIEST, HDF5Constants.H5F_LIBVER_V18,
                                   HDF5Constants.H5F_LIBVER_V110,     HDF5Constants.H5F_LIBVER_V112,
-                                  HDF5Constants.H5F_LIBVER_V114,     HDF5Constants.H5F_LIBVER_V116,
+                                  HDF5Constants.H5F_LIBVER_V114,     HDF5Constants.H5F_LIBVER_V200,
                                   HDF5Constants.H5F_LIBVER_LATEST};
-            String[] highValues = {"V18", "V110", "V112", "V114", "V116", "Latest"};
+            String[] highValues = {"V18", "V110", "V112", "V114", "V200", "Latest"};
             int[] highConstants = {HDF5Constants.H5F_LIBVER_V18,  HDF5Constants.H5F_LIBVER_V110,
                                    HDF5Constants.H5F_LIBVER_V112, HDF5Constants.H5F_LIBVER_V114,
-                                   HDF5Constants.H5F_LIBVER_V116, HDF5Constants.H5F_LIBVER_LATEST};
+                                   HDF5Constants.H5F_LIBVER_V200, HDF5Constants.H5F_LIBVER_LATEST};
 
             // Try to retrieve the existing version bounds
             int[] current = null;

diff --git a/src/org.hdfgroup.object/hdf/object/h5/H5File.java b/src/org.hdfgroup.object/hdf/object/h5/H5File.java
@@ -140,7 +140,7 @@ public class H5File extends FileFormat {
     /** The library v1.14 version value */
     public static final int LIBVER_V114 = HDF5Constants.H5F_LIBVER_V114;
     /** The library v1.16 version value */
-    public static final int LIBVER_V116 = HDF5Constants.H5F_LIBVER_V116;
+    public static final int LIBVER_V200 = HDF5Constants.H5F_LIBVER_V200;
 
     /**
      * Indicate that this file is open for reading in a
@@ -1099,8 +1099,8 @@ else if (lowStr.equals("V112"))
             low = HDF5Constants.H5F_LIBVER_V112;
         else if (lowStr.equals("V114"))
             low = HDF5Constants.H5F_LIBVER_V114;
-        else if (lowStr.equals("V116"))
-            low = HDF5Constants.H5F_LIBVER_V116;
+        else if (lowStr.equals("V200"))
+            low = HDF5Constants.H5F_LIBVER_V200;
         else if (lowStr.equals("Latest"))
             low = HDF5Constants.H5F_LIBVER_LATEST;
         else
@@ -1116,8 +1116,8 @@ else if (highStr.equals("V112"))
             high = HDF5Constants.H5F_LIBVER_V112;
         else if (highStr.equals("V114"))
             high = HDF5Constants.H5F_LIBVER_V114;
-        else if (highStr.equals("V116"))
-            high = HDF5Constants.H5F_LIBVER_V116;
+        else if (highStr.equals("V200"))
+            high = HDF5Constants.H5F_LIBVER_V200;
         else if (highStr.equals("Latest"))
             high = HDF5Constants.H5F_LIBVER_LATEST;
         else
@@ -1163,8 +1163,8 @@ else if (lowStr.equals("V112"))
                 low = HDF5Constants.H5F_LIBVER_V112;
             else if (lowStr.equals("V114"))
                 low = HDF5Constants.H5F_LIBVER_V114;
-            else if (lowStr.equals("V116"))
-                low = HDF5Constants.H5F_LIBVER_V116;
+            else if (lowStr.equals("V200"))
+                low = HDF5Constants.H5F_LIBVER_V200;
             else if (lowStr.equals("Latest"))
                 low = HDF5Constants.H5F_LIBVER_LATEST;
             else
@@ -1180,8 +1180,8 @@ else if (highStr.equals("V112"))
                 high = HDF5Constants.H5F_LIBVER_V112;
             else if (highStr.equals("V114"))
                 high = HDF5Constants.H5F_LIBVER_V114;
-            else if (highStr.equals("V116"))
-                high = HDF5Constants.H5F_LIBVER_V116;
+            else if (highStr.equals("V200"))
+                high = HDF5Constants.H5F_LIBVER_V200;
             else if (highStr.equals("Latest"))
                 high = HDF5Constants.H5F_LIBVER_LATEST;
             else
@@ -1255,8 +1255,8 @@ else if (libver[0] == HDF5Constants.H5F_LIBVER_V112)
             libversion = "V112 and ";
         else if (libver[0] == HDF5Constants.H5F_LIBVER_V114)
             libversion = "V114 and ";
-        else if (libver[0] == HDF5Constants.H5F_LIBVER_V116)
-            libversion = "V116 and ";
+        else if (libver[0] == HDF5Constants.H5F_LIBVER_V200)
+            libversion = "V200 and ";
         else if (libver[0] == HDF5Constants.H5F_LIBVER_LATEST)
             libversion = "Latest and ";
 
@@ -1270,8 +1270,8 @@ else if (libver[1] == HDF5Constants.H5F_LIBVER_V112)
             libversion += "V112";
         else if (libver[1] == HDF5Constants.H5F_LIBVER_V114)
             libversion += "V114";
-        else if (libver[1] == HDF5Constants.H5F_LIBVER_V116)
-            libversion += "V116";
+        else if (libver[1] == HDF5Constants.H5F_LIBVER_V200)
+            libversion += "V200";
         else if (libver[1] == HDF5Constants.H5F_LIBVER_LATEST)
             libversion += "Latest";
         return libversion;

diff --git a/test/org.hdfgroup.hdfview.test/uitest/TestHDFViewLibBounds.java b/test/org.hdfgroup.hdfview.test/uitest/TestHDFViewLibBounds.java
@@ -34,8 +34,8 @@ public void testLibVersion()
 
             String val = bot.textWithLabel("Library version bounds: ").getText();
             assertTrue(
-                constructWrongValueMessage("testLibVersion()", "wrong lib bounds", "Earliest and V116", val),
-                val.equals("Earliest and V116"));
+                constructWrongValueMessage("testLibVersion()", "wrong lib bounds", "Earliest and V200", val),
+                val.equals("Earliest and V200"));
 
             SWTBotTreeItem[] items = filetree.getAllItems();
             items[0].click();
@@ -51,8 +51,8 @@ public void testLibVersion()
 
             val = bot.textWithLabel("Library version bounds: ").getText();
             assertTrue(
-                constructWrongValueMessage("testLibVersion()", "wrong lib bounds", "V18 and V116", val),
-                val.equals("V18 and V116"));
+                constructWrongValueMessage("testLibVersion()", "wrong lib bounds", "V18 and V200", val),
+                val.equals("V18 and V200"));
 
             items[0].contextMenu().contextMenu("Set Lib version bounds").click();