From b8572df00de95273b7bd3c313efa5e93f34c649d Mon Sep 17 00:00:00 2001 From: Daniel Knowles Date: Mon, 18 Aug 2025 10:02:38 -0400 Subject: [PATCH 1/2] Band Grouping: revised to display name of band group or slightly trim name of the band group expression --- .../org/esa/snap/rcp/nodes/PNGroupNode.java | 39 ++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/snap-rcp/src/main/java/org/esa/snap/rcp/nodes/PNGroupNode.java b/snap-rcp/src/main/java/org/esa/snap/rcp/nodes/PNGroupNode.java index 343c66bfd6..94ee5a0842 100644 --- a/snap-rcp/src/main/java/org/esa/snap/rcp/nodes/PNGroupNode.java +++ b/snap-rcp/src/main/java/org/esa/snap/rcp/nodes/PNGroupNode.java @@ -6,6 +6,7 @@ package org.esa.snap.rcp.nodes; import org.esa.snap.core.datamodel.ProductNodeEvent; +import org.esa.snap.core.util.StringUtils; import org.openide.util.lookup.Lookups; /** @@ -19,7 +20,43 @@ class PNGroupNode extends PNNodeBase { PNGroupNode(PNGroup group) { super(group, Lookups.fixed(group.getProduct())); - setDisplayName(group.getDisplayName()); +// setDisplayName(group.getDisplayName()); + + String displayName = group.getDisplayName(); + + if (displayName.contains("#")) { + final String[] split = StringUtils.split(displayName, new char[]{'#'}, true); + final String groupName = split[0]; + if (groupName.length() > 0) { + displayName = groupName; + } + } else { + if (displayName.startsWith("^")) { + displayName = displayName.substring(0); + } + + if (displayName.endsWith("$")) { + displayName = displayName.substring(0, displayName.length() - 1); + } + + if (displayName.startsWith("*")) { + displayName = displayName.substring(0); + } + + if (displayName.endsWith("*")) { + displayName = displayName.substring(0, displayName.length() - 1); + } + + if (displayName.endsWith("_")) { + displayName = displayName.substring(0, displayName.length() - 1); + } + } + + + setDisplayName(displayName); + + + setIconBaseWithExtension("org/esa/snap/rcp/icons/RsGroup16.gif"); nodeSupport = PNNodeSupport.create(this, group); } From 1721febae3d20a0d371a7ef7cd27d32b16adf975 Mon Sep 17 00:00:00 2001 From: Daniel Knowles Date: Mon, 18 Aug 2025 14:11:04 -0400 Subject: [PATCH 2/2] Band Grouping: used string utility for stripping down the group expression into a simple name --- .../org/esa/snap/rcp/nodes/PNGroupNode.java | 34 +------------------ 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/snap-rcp/src/main/java/org/esa/snap/rcp/nodes/PNGroupNode.java b/snap-rcp/src/main/java/org/esa/snap/rcp/nodes/PNGroupNode.java index 94ee5a0842..e8065f7271 100644 --- a/snap-rcp/src/main/java/org/esa/snap/rcp/nodes/PNGroupNode.java +++ b/snap-rcp/src/main/java/org/esa/snap/rcp/nodes/PNGroupNode.java @@ -20,43 +20,11 @@ class PNGroupNode extends PNNodeBase { PNGroupNode(PNGroup group) { super(group, Lookups.fixed(group.getProduct())); -// setDisplayName(group.getDisplayName()); String displayName = group.getDisplayName(); - - if (displayName.contains("#")) { - final String[] split = StringUtils.split(displayName, new char[]{'#'}, true); - final String groupName = split[0]; - if (groupName.length() > 0) { - displayName = groupName; - } - } else { - if (displayName.startsWith("^")) { - displayName = displayName.substring(0); - } - - if (displayName.endsWith("$")) { - displayName = displayName.substring(0, displayName.length() - 1); - } - - if (displayName.startsWith("*")) { - displayName = displayName.substring(0); - } - - if (displayName.endsWith("*")) { - displayName = displayName.substring(0, displayName.length() - 1); - } - - if (displayName.endsWith("_")) { - displayName = displayName.substring(0, displayName.length() - 1); - } - } - - + displayName = StringUtils.cleanUpGroupName(displayName); setDisplayName(displayName); - - setIconBaseWithExtension("org/esa/snap/rcp/icons/RsGroup16.gif"); nodeSupport = PNNodeSupport.create(this, group); }