hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix exception on one export component

Browse Source
This commit is contained in:
SiboVG 2023-08-28 08:42:34 +01:00
parent bb46b8d7bf
commit b721e9552e
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
swing/src/net/sf/openrocket/file/wavefrontobj/OBJOptionChooser.java
View File

@ -112,6 +112,7 @@ public class OBJOptionChooser extends JPanel {
if (e.getStateChange() == ItemEvent.SELECTED) { if (e.getStateChange() == ItemEvent.SELECTED) {
final Set<RocketComponent> allComponents = new HashSet<>(); final Set<RocketComponent> allComponents = new HashSet<>();
for (RocketComponent component : selectedComponents) { for (RocketComponent component : selectedComponents) {
allComponents.add(component);
allComponents.addAll(component.getAllChildren()); allComponents.addAll(component.getAllChildren());
} }
components = new ArrayList<>(allComponents); components = new ArrayList<>(allComponents);
@ -279,18 +280,16 @@ public class OBJOptionChooser extends JPanel {
final String componentName = isSingleComponent ? "<b>" + components.get(0).getName() + "</b>": final String componentName = isSingleComponent ? "<b>" + components.get(0).getName() + "</b>":
trans.get("OBJOptionChooser.lbl.multipleComponents"); trans.get("OBJOptionChooser.lbl.multipleComponents");
labelText = String.format(trans.get("OBJOptionChooser.lbl.component"), componentName); labelText = String.format(trans.get("OBJOptionChooser.lbl.component"), componentName);
if (!isSingleComponent) {
tooltip = createComponentsTooltip(components); tooltip = createComponentsTooltip(components);
} else {
tooltip = "";
}
componentsLabel.setText(labelText); componentsLabel.setText(labelText);
componentsLabel.setToolTipText(tooltip); componentsLabel.setToolTipText(tooltip);
} }
private static String createComponentsTooltip(List<RocketComponent> selectedComponents) { private static String createComponentsTooltip(List<RocketComponent> selectedComponents) {
if (selectedComponents.size() <= 1) {
return "";
}
StringBuilder tooltipBuilder = new StringBuilder("<html>"); StringBuilder tooltipBuilder = new StringBuilder("<html>");
int counter = 0; int counter = 0;
for (int i = 0; i < selectedComponents.size()-1; i++) { for (int i = 0; i < selectedComponents.size()-1; i++) {