From b721e9552ef42fbbd79285fe0a4c9d417d06c715 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Mon, 28 Aug 2023 08:42:34 +0100 Subject: [PATCH] Fix exception on one export component --- .../file/wavefrontobj/OBJOptionChooser.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/swing/src/net/sf/openrocket/file/wavefrontobj/OBJOptionChooser.java b/swing/src/net/sf/openrocket/file/wavefrontobj/OBJOptionChooser.java index 5f72af59b..efc288c4c 100644 --- a/swing/src/net/sf/openrocket/file/wavefrontobj/OBJOptionChooser.java +++ b/swing/src/net/sf/openrocket/file/wavefrontobj/OBJOptionChooser.java @@ -112,6 +112,7 @@ public class OBJOptionChooser extends JPanel { if (e.getStateChange() == ItemEvent.SELECTED) { final Set allComponents = new HashSet<>(); for (RocketComponent component : selectedComponents) { + allComponents.add(component); allComponents.addAll(component.getAllChildren()); } components = new ArrayList<>(allComponents); @@ -279,18 +280,16 @@ public class OBJOptionChooser extends JPanel { final String componentName = isSingleComponent ? "" + components.get(0).getName() + "": trans.get("OBJOptionChooser.lbl.multipleComponents"); labelText = String.format(trans.get("OBJOptionChooser.lbl.component"), componentName); - - if (!isSingleComponent) { - tooltip = createComponentsTooltip(components); - } else { - tooltip = ""; - } - + tooltip = createComponentsTooltip(components); componentsLabel.setText(labelText); componentsLabel.setToolTipText(tooltip); } private static String createComponentsTooltip(List selectedComponents) { + if (selectedComponents.size() <= 1) { + return ""; + } + StringBuilder tooltipBuilder = new StringBuilder(""); int counter = 0; for (int i = 0; i < selectedComponents.size()-1; i++) {