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

Fix duplication NullPointException

Browse Source
This commit is contained in:
SiboVG 2022-06-02 00:44:10 +02:00
parent 95aedeaaf3
commit 8f2201ba9b
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
swing/src/net/sf/openrocket/gui/main/RocketActions.java
View File

@ -5,6 +5,7 @@ import java.awt.Toolkit;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@ -802,41 +803,40 @@ public class RocketActions {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
List<RocketComponent> components = selectionModel.getSelectedComponents(); List<RocketComponent> components = selectionModel.getSelectedComponents();
if (components != null) { if (components != null) {
components.sort(Comparator.comparing(c -> c.getParent() != null ? c.getParent().getChildPosition(c) : 0));
components = new ArrayList<>(components); components = new ArrayList<>(components);
fillInMissingSelections(components); fillInMissingSelections(components);
components.sort(Comparator.comparing(c -> c.getParent() != null ? -c.getParent().getChildPosition(c) : 0));
} }
Simulation[] sims = selectionModel.getSelectedSimulations(); Simulation[] sims = selectionModel.getSelectedSimulations();
if (isCopyable(components)) { if (isCopyable(components)) {
ComponentConfigDialog.disposeDialog(); ComponentConfigDialog.disposeDialog();
List<RocketComponent> copiedComponents = new LinkedList<>(copyComponentsMaintainParent(components));
List<RocketComponent> copiedComponents = copyComponentsMaintainParent(components);
OpenRocketClipboard.setClipboard(copiedComponents); OpenRocketClipboard.setClipboard(copiedComponents);
copiedComponents = new LinkedList<>(OpenRocketClipboard.getClipboardComponents()); copiedComponents = new LinkedList<>(OpenRocketClipboard.getClipboardComponents());
List<RocketComponent> pasted = new LinkedList<>();
List<RocketComponent> duplicateComponents = new LinkedList<>();
for (RocketComponent component : copiedComponents) { for (RocketComponent component : copiedComponents) {
pasted.add(component.copy()); duplicateComponents.add(component.copy());
} }
List<Pair<RocketComponent, Integer>> positions = new LinkedList<>(); List<Pair<RocketComponent, Integer>> positions = new LinkedList<>();
for (RocketComponent component : pasted) { for (RocketComponent component : duplicateComponents) {
positions.add(getPastePosition(component)); positions.add(getPastePosition(component));
} }
if (pasted.size() == 1) { if (duplicateComponents.size() == 1) {
document.addUndoPosition("Duplicate " + pasted.get(0).getComponentName()); document.addUndoPosition("Duplicate " + duplicateComponents.get(0).getComponentName());
} else { } else {
document.addUndoPosition("Duplicate components"); document.addUndoPosition("Duplicate components");
} }
for (int i = 0; i < pasted.size(); i++) { for (int i = 0; i < duplicateComponents.size(); i++) {
positions.get(i).getU().addChild(pasted.get(i), positions.get(i).getV()); positions.get(i).getU().addChild(duplicateComponents.get(i), positions.get(i).getV());
} }
selectionModel.setSelectedComponents(pasted); selectionModel.setSelectedComponents(duplicateComponents);
parentFrame.selectTab(BasicFrame.COMPONENT_TAB); parentFrame.selectTab(BasicFrame.COMPONENT_TAB);
} else if (sims != null && sims.length > 0) { } else if (sims != null && sims.length > 0) {