Skip to content

Commit 5134f31

Browse files
authored
Merge pull request #1438 from lesserwhirls/toolsui
ToolsUI bug fixes
2 parents 8c2b5af + c45b5d8 commit 5134f31

5 files changed

Lines changed: 13 additions & 9 deletions

File tree

gradle/any/shared-mvn-coords.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ext {
1818
// best we can do is define the version here, which can then be applied in all of the places we need the full maven
1919
// coords.
2020
depVersion = [:]
21-
depVersion.slf4j = '1.7.28'
21+
depVersion.slf4j = '2.0.17'
2222
depVersion.protobuf = '3.25.5'
2323
depVersion.grpc = '1.60.0'
2424
}

netcdf-java-platform/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ dependencies {
7676

7777
// netcdf-java logging
7878
api "org.slf4j:slf4j-api:${depVersion.slf4j}"
79-
runtime 'ch.qos.logback:logback-classic:1.5.14'
79+
runtime 'ch.qos.logback:logback-classic:1.3.15'
8080

8181
// legacy gradle module
8282
// todo: remove with legacy in 6

uicdm/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ dependencies {
4040
testImplementation 'junit:junit'
4141

4242
runtimeOnly project(':cdm:cdm-s3')
43+
runtimeOnly project(':cdm:cdm-zarr')
4344

4445
// constrained by netcdf-java-platform
4546
runtimeOnly 'ch.qos.logback:logback-classic'

uicdm/src/main/java/ucar/nc2/ui/coverage2/CoverageTable.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
import ucar.nc2.ft2.coverage.*;
1313
import ucar.ui.widget.*;
1414
import ucar.ui.widget.PopupMenu;
15-
import ucar.nc2.util.Misc;
16-
import ucar.nc2.util.NamedObject;
15+
import ucar.util.NamedObject;
1716
import ucar.util.prefs.PreferencesExt;
1817
import ucar.ui.prefs.BeanTable;
1918
import javax.swing.*;

uicdm/src/main/java/ucar/nc2/ui/dialog/NetcdfOutputChooser.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
/*
2+
* Copyright (c) 1998-2025 John Caron and University Corporation for Atmospheric Research/Unidata
3+
* See LICENSE for license information.
4+
*
25
* Created by JFormDesigner on Thu Nov 15 14:02:02 MST 2012
36
*/
47

58
package ucar.nc2.ui.dialog;
69

7-
import ucar.nc2.NetcdfFileWriter;
10+
import java.util.Arrays;
811
import ucar.nc2.util.ListenerManager;
912
import ucar.nc2.write.Nc4Chunking;
1013
import javax.swing.*;
@@ -44,8 +47,8 @@ public void setOutputFilename(String filename) {
4447
location = location.substring(0, pos);
4548

4649
// change suffix
47-
NetcdfFileWriter.Version version = (NetcdfFileWriter.Version) netcdfVersion.getSelectedItem();
48-
String suffix = (version == null) ? ".nc" : version.getSuffix();
50+
NetcdfFileFormat version = (NetcdfFileFormat) netcdfVersion.getSelectedItem();
51+
String suffix = (version != null && version.isNetcdf4Format()) ? ".nc4" : ".nc";
4952
if (filename.endsWith(".nc") && suffix.equals(".nc"))
5053
suffix = ".sub.nc";
5154
location += suffix;
@@ -105,10 +108,11 @@ private void initComponents() {
105108
label1 = new JLabel();
106109
outputFilename = new JTextField();
107110
label2 = new JLabel();
108-
netcdfVersion = new JComboBox(NetcdfFileWriter.Version.values());
111+
netcdfVersion = new JComboBox<>(
112+
Arrays.stream(NetcdfFileFormat.values()).filter(format -> format != NetcdfFileFormat.INVALID).toArray());
109113
panel1 = new JPanel();
110114
label3 = new JLabel();
111-
chunking = new JComboBox(Nc4Chunking.Strategy.values());
115+
chunking = new JComboBox<>(Nc4Chunking.Strategy.values());
112116
deflate = new JCheckBox();
113117
shuffle = new JCheckBox();
114118
buttonBar = new JPanel();

0 commit comments

Comments
 (0)