Skip to content

Commit 3e28df9

Browse files
lesserwhirlslesserwhirls
authored
Merge pull request #1481 from lesserwhirls/tui
ToolsUI Bug fixes
2 parents 106ba30 + 3c95c44 commit 3e28df9

5 files changed

Lines changed: 63 additions & 28 deletions

File tree

‎uicdm/build.gradle‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,14 @@ application {
5252
}
5353

5454
jar.manifest.attributes 'Main-Class': 'ucar.nc2.ui.ToolsUI'
55+
56+
def genBuildInfo = tasks.register("generateBuildInfo", WriteProperties) {
57+
destinationFile = getLayout().buildDirectory.file("resources/main/toolsui.properties")
58+
comment = "Application configuration generated by Gradle"
59+
encoding = "UTF-8"
60+
61+
property("toolsui.version", project.version)
62+
property("toolsui.buildTimestamp", project.buildTimestamp) // Defined in root project.
63+
}
64+
65+
processResources.dependsOn(genBuildInfo)

‎uicdm/src/main/java/ucar/nc2/ui/BuildInfo.java‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*
2+
* Copyright (c) 2025 University Corporation for Atmospheric Research/Unidata
3+
* See LICENSE for license information.
4+
*/
5+
6+
package ucar.nc2.ui;
7+
8+
import java.io.IOException;
9+
import java.io.InputStream;
10+
import java.util.Properties;
11+
12+
public class BuildInfo {
13+
14+
private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(BuildInfo.class);
15+
16+
private final String version, timestamp;
17+
18+
BuildInfo(String version, String timestamp) {
19+
this.version = version;
20+
this.timestamp = timestamp;
21+
}
22+
23+
public String getVersion() {
24+
return version;
25+
}
26+
27+
public String getTimestamp() {
28+
return timestamp;
29+
}
30+
31+
static BuildInfo getToolsUIBuildInfo() {
32+
Properties buildProps = new Properties();
33+
try (InputStream stream = ToolsUI.class.getClassLoader().getResourceAsStream("toolsui.properties")) {
34+
buildProps.load(stream);
35+
} catch (IOException e) {
36+
log.error("Error reading build properties");
37+
}
38+
return new BuildInfo(buildProps.getProperty("toolsui.version", "Unknown"),
39+
buildProps.getProperty("toolsui.buildTimestamp", "Unknown"));
40+
}
41+
42+
}

‎uicdm/src/main/java/ucar/nc2/ui/ToolsAboutWindow.java‎

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
/*
2-
* Copyright (c) 1998-2019 University Corporation for Atmospheric Research/Unidata
2+
* Copyright (c) 1998-2025 University Corporation for Atmospheric Research/Unidata
33
* See LICENSE for license information.
44
*/
55

66
package ucar.nc2.ui;
77

8-
import java.nio.charset.StandardCharsets;
98
import ucar.ui.util.Resource;
109
import ucar.ui.widget.BAMutil;
1110
import java.awt.BorderLayout;
@@ -19,10 +18,6 @@
1918
import java.awt.Toolkit;
2019
import java.awt.event.MouseAdapter;
2120
import java.awt.event.MouseEvent;
22-
import java.io.BufferedReader;
23-
import java.io.InputStream;
24-
import java.io.InputStreamReader;
25-
import java.io.IOException;
2621
import javax.swing.BorderFactory;
2722
import javax.swing.ImageIcon;
2823
import javax.swing.JFrame;
@@ -42,7 +37,8 @@ public ToolsAboutWindow(JFrame parent) {
4237
super(parent);
4338

4439
JLabel lab1 = new JLabel("<html> <body bgcolor=\"#FFECEC\"> <center>"
45-
+ "<h1>Netcdf Tools User Interface (ToolsUI)</h1>" + "<b>" + getVersion() + "</b>"
40+
+ "<h1>Netcdf Tools User Interface (ToolsUI)</h1>" + "<b>" + BuildInfo.getToolsUIBuildInfo().getVersion()
41+
+ "</b>" + "<br>Build Date: " + "<b>" + BuildInfo.getToolsUIBuildInfo().getTimestamp() + "</b>"
4642
+ "<br><i>https://www.unidata.ucar.edu/software/netcdf-java/</i>"
4743
+ "<br><b><i>Developers:</b> John Caron, Sean Arms, Dennis Heimbinger, Ryan May, Christian Ward-Garrison</i></b>"
4844
+ "</center>" + "<br><br>With thanks to these <b>Open Source</b> contributors:" + "<ul>"
@@ -120,23 +116,6 @@ public void mousePressed(MouseEvent e) {
120116
*
121117
*/
122118
private String getVersion() {
123-
String version;
124-
try (InputStream is = Resource.getFileResource("/README")) {
125-
if (is == null) {
126-
return "5.0";
127-
}
128-
BufferedReader dataIS = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8));
129-
StringBuilder sbuff = new StringBuilder();
130-
for (int i = 0; i < 3; i++) {
131-
sbuff.append(dataIS.readLine());
132-
sbuff.append("<br>");
133-
}
134-
version = sbuff.toString();
135-
} catch (IOException ioe) {
136-
ioe.printStackTrace();
137-
version = "version unknown";
138-
}
139-
140-
return version;
119+
return BuildInfo.getToolsUIBuildInfo().getVersion();
141120
}
142121
}

‎uicdm/src/main/java/ucar/nc2/ui/ToolsSplashScreen.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1998-2019 University Corporation for Atmospheric Research/Unidata
2+
* Copyright (c) 1998-2025 University Corporation for Atmospheric Research/Unidata
33
* See LICENSE for license information.
44
*/
55

‎uicdm/src/main/java/ucar/nc2/ui/ToolsUI.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
public class ToolsUI extends JPanel {
6060
private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
6161

62-
private static final String DIALOG_VERSION = "5.0";
62+
private static final String DIALOG_VERSION = BuildInfo.getToolsUIBuildInfo().getVersion();
6363

6464
public static final String WORLD_DETAIL_MAP = "/resources/ui/maps/Countries.shp";
6565
public static final String US_MAP = "/resources/ui/maps/us_state.shp";
@@ -1524,11 +1524,14 @@ public void setMessage(SocketMessage.Event event) {
15241524
}
15251525

15261526
if (!configRead) {
1527+
// if System.getProperty("user.home") is set, look under user_home/.unidata for nj22Config.xml,
1528+
// otherwise look under the relative directory .unidata
15271529
String filename = XMLStore.makeStandardFilename(".unidata", "nj22Config.xml");
15281530
File f = new File(filename);
15291531
if (f.exists()) {
15301532
try (FileInputStream fis = new FileInputStream(filename)) {
15311533
StringBuilder errlog = new StringBuilder();
1534+
RuntimeConfigParser.read(fis, errlog);
15321535
System.out.println(errlog);
15331536
} catch (IOException ioe) {
15341537
log.warn("Error reading {} = {}", filename, ioe.getMessage());
@@ -1600,7 +1603,7 @@ public void setMessage(SocketMessage.Event event) {
16001603
} catch (HTTPException e) {
16011604
log.error("Failed to set global credentials");
16021605
}
1603-
HTTPSession.setGlobalUserAgent("ToolsUI v5.0");
1606+
HTTPSession.setGlobalUserAgent(String.format("ToolsUI v%s", BuildInfo.getToolsUIBuildInfo().getVersion()));
16041607

16051608
java.net.Authenticator.setDefault(provider);
16061609
});

0 commit comments

Comments
 (0)