Skip to content

Commit d5ac702

Browse files
byrnHDFbyrnHDF
authored
Update to latest develop vesrsion (#346)
1 parent c685959 commit d5ac702

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

‎.github/workflows/daily-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
required: false
1111
default: check
1212
schedule:
13-
- cron: "5 0 * * *"
13+
- cron: "7 0 * * *"
1414

1515
permissions:
1616
contents: read

‎src/org.hdfgroup.hdfview/hdf/view/TreeView/DefaultTreeView.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3334,15 +3334,15 @@ public void open()
33343334
openShell.setImages(ViewProperties.getHdfIcons());
33353335
openShell.setLayout(new GridLayout(1, true));
33363336

3337-
String[] lowValues = {"Earliest", "V18", "V110", "V112", "V114", "V116", "Latest"};
3337+
String[] lowValues = {"Earliest", "V18", "V110", "V112", "V114", "V200", "Latest"};
33383338
int[] lowConstants = {HDF5Constants.H5F_LIBVER_EARLIEST, HDF5Constants.H5F_LIBVER_V18,
33393339
HDF5Constants.H5F_LIBVER_V110, HDF5Constants.H5F_LIBVER_V112,
3340-
HDF5Constants.H5F_LIBVER_V114, HDF5Constants.H5F_LIBVER_V116,
3340+
HDF5Constants.H5F_LIBVER_V114, HDF5Constants.H5F_LIBVER_V200,
33413341
HDF5Constants.H5F_LIBVER_LATEST};
3342-
String[] highValues = {"V18", "V110", "V112", "V114", "V116", "Latest"};
3342+
String[] highValues = {"V18", "V110", "V112", "V114", "V200", "Latest"};
33433343
int[] highConstants = {HDF5Constants.H5F_LIBVER_V18, HDF5Constants.H5F_LIBVER_V110,
33443344
HDF5Constants.H5F_LIBVER_V112, HDF5Constants.H5F_LIBVER_V114,
3345-
HDF5Constants.H5F_LIBVER_V116, HDF5Constants.H5F_LIBVER_LATEST};
3345+
HDF5Constants.H5F_LIBVER_V200, HDF5Constants.H5F_LIBVER_LATEST};
33463346

33473347
// Try to retrieve the existing version bounds
33483348
int[] current = null;

‎src/org.hdfgroup.object/hdf/object/h5/H5File.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public class H5File extends FileFormat {
140140
/** The library v1.14 version value */
141141
public static final int LIBVER_V114 = HDF5Constants.H5F_LIBVER_V114;
142142
/** The library v1.16 version value */
143-
public static final int LIBVER_V116 = HDF5Constants.H5F_LIBVER_V116;
143+
public static final int LIBVER_V200 = HDF5Constants.H5F_LIBVER_V200;
144144

145145
/**
146146
* Indicate that this file is open for reading in a
@@ -1099,8 +1099,8 @@ else if (lowStr.equals("V112"))
10991099
low = HDF5Constants.H5F_LIBVER_V112;
11001100
else if (lowStr.equals("V114"))
11011101
low = HDF5Constants.H5F_LIBVER_V114;
1102-
else if (lowStr.equals("V116"))
1103-
low = HDF5Constants.H5F_LIBVER_V116;
1102+
else if (lowStr.equals("V200"))
1103+
low = HDF5Constants.H5F_LIBVER_V200;
11041104
else if (lowStr.equals("Latest"))
11051105
low = HDF5Constants.H5F_LIBVER_LATEST;
11061106
else
@@ -1116,8 +1116,8 @@ else if (highStr.equals("V112"))
11161116
high = HDF5Constants.H5F_LIBVER_V112;
11171117
else if (highStr.equals("V114"))
11181118
high = HDF5Constants.H5F_LIBVER_V114;
1119-
else if (highStr.equals("V116"))
1120-
high = HDF5Constants.H5F_LIBVER_V116;
1119+
else if (highStr.equals("V200"))
1120+
high = HDF5Constants.H5F_LIBVER_V200;
11211121
else if (highStr.equals("Latest"))
11221122
high = HDF5Constants.H5F_LIBVER_LATEST;
11231123
else
@@ -1163,8 +1163,8 @@ else if (lowStr.equals("V112"))
11631163
low = HDF5Constants.H5F_LIBVER_V112;
11641164
else if (lowStr.equals("V114"))
11651165
low = HDF5Constants.H5F_LIBVER_V114;
1166-
else if (lowStr.equals("V116"))
1167-
low = HDF5Constants.H5F_LIBVER_V116;
1166+
else if (lowStr.equals("V200"))
1167+
low = HDF5Constants.H5F_LIBVER_V200;
11681168
else if (lowStr.equals("Latest"))
11691169
low = HDF5Constants.H5F_LIBVER_LATEST;
11701170
else
@@ -1180,8 +1180,8 @@ else if (highStr.equals("V112"))
11801180
high = HDF5Constants.H5F_LIBVER_V112;
11811181
else if (highStr.equals("V114"))
11821182
high = HDF5Constants.H5F_LIBVER_V114;
1183-
else if (highStr.equals("V116"))
1184-
high = HDF5Constants.H5F_LIBVER_V116;
1183+
else if (highStr.equals("V200"))
1184+
high = HDF5Constants.H5F_LIBVER_V200;
11851185
else if (highStr.equals("Latest"))
11861186
high = HDF5Constants.H5F_LIBVER_LATEST;
11871187
else
@@ -1255,8 +1255,8 @@ else if (libver[0] == HDF5Constants.H5F_LIBVER_V112)
12551255
libversion = "V112 and ";
12561256
else if (libver[0] == HDF5Constants.H5F_LIBVER_V114)
12571257
libversion = "V114 and ";
1258-
else if (libver[0] == HDF5Constants.H5F_LIBVER_V116)
1259-
libversion = "V116 and ";
1258+
else if (libver[0] == HDF5Constants.H5F_LIBVER_V200)
1259+
libversion = "V200 and ";
12601260
else if (libver[0] == HDF5Constants.H5F_LIBVER_LATEST)
12611261
libversion = "Latest and ";
12621262

@@ -1270,8 +1270,8 @@ else if (libver[1] == HDF5Constants.H5F_LIBVER_V112)
12701270
libversion += "V112";
12711271
else if (libver[1] == HDF5Constants.H5F_LIBVER_V114)
12721272
libversion += "V114";
1273-
else if (libver[1] == HDF5Constants.H5F_LIBVER_V116)
1274-
libversion += "V116";
1273+
else if (libver[1] == HDF5Constants.H5F_LIBVER_V200)
1274+
libversion += "V200";
12751275
else if (libver[1] == HDF5Constants.H5F_LIBVER_LATEST)
12761276
libversion += "Latest";
12771277
return libversion;

‎test/org.hdfgroup.hdfview.test/uitest/TestHDFViewLibBounds.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ public void testLibVersion()
3434

3535
String val = bot.textWithLabel("Library version bounds: ").getText();
3636
assertTrue(
37-
constructWrongValueMessage("testLibVersion()", "wrong lib bounds", "Earliest and V116", val),
38-
val.equals("Earliest and V116"));
37+
constructWrongValueMessage("testLibVersion()", "wrong lib bounds", "Earliest and V200", val),
38+
val.equals("Earliest and V200"));
3939

4040
SWTBotTreeItem[] items = filetree.getAllItems();
4141
items[0].click();
@@ -51,8 +51,8 @@ public void testLibVersion()
5151

5252
val = bot.textWithLabel("Library version bounds: ").getText();
5353
assertTrue(
54-
constructWrongValueMessage("testLibVersion()", "wrong lib bounds", "V18 and V116", val),
55-
val.equals("V18 and V116"));
54+
constructWrongValueMessage("testLibVersion()", "wrong lib bounds", "V18 and V200", val),
55+
val.equals("V18 and V200"));
5656

5757
items[0].contextMenu().contextMenu("Set Lib version bounds").click();
5858

0 commit comments

Comments
 (0)