Merge pull request #2185 from SiboVG/issue-2183

[#2183] Don't track stages when copying

core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java

@@ -1679,6 +1679,22 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
 	///////////  Children handling  ///////////
 	
 	
+	/**
+	 * Adds a child to the rocket component tree.  The component is added to the end
+	 * of the component's child list.  This is a helper method that calls
+	 * {@link #addChild(RocketComponent,int)}.
+	 *
+	 * @param component  The component to add.
+	 * @param trackStage If component is a stage, this check will decide whether the rocket should track that stage (add it to the stageList etc.)
+	 * @throws IllegalArgumentException  if the component is already part of some
+	 * 									 component tree.
+	 * @see #addChild(RocketComponent,int)
+	 */
+	public final void addChild(RocketComponent component, boolean trackStage) {
+		checkState();
+		addChild(component, children.size(), trackStage);
+	}
+
 	/**
 	 * Adds a child to the rocket component tree.  The component is added to the end
 	 * of the component's child list.  This is a helper method that calls
@@ -1690,10 +1706,9 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
 	 * @see #addChild(RocketComponent,int)
 	 */
 	public final void addChild(RocketComponent component) {
-		checkState();
+		addChild(component, true);
-		addChild(component, children.size());
 	}
-	
+
 	/**
 	 * Adds a child to the rocket component tree.  The component is added to
 	 * the given position of the component's child list.
@@ -1703,28 +1718,29 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
 	 *
 	 * @param component	The component to add.
 	 * @param index		Position to add component to.
+	 * @param trackStage If component is a stage, this check will decide whether the rocket should track that stage (add it to the stageList etc.)
 	 * @throws IllegalArgumentException  If the component is already part of
 	 * 									 some component tree.
 	 */
-	public void addChild(RocketComponent component, int index) {
+	public void addChild(RocketComponent component, int index, boolean trackStage) {
 		checkState();
-		
+
 		if (component.parent != null) {
 			throw new IllegalArgumentException("component " + component.getComponentName() +
 					" is already in a tree");
 		}
-		
+
 		// Ensure that the no loops are created in component tree [A -> X -> Y -> B, B.addChild(A)]
 		if (this.getRoot().equals(component)) {
 			throw new IllegalStateException("Component " + component.getComponentName() +
 					" is a parent of " + this.getComponentName() + ", attempting to create cycle in tree.");
 		}
-		
+
 		if (!isCompatible(component)) {
 			throw new IllegalStateException("Component: " + component.getComponentName() +
 					" not currently compatible with component: " + getComponentName());
 		}
-		
+
 		children.add(index, component);
 		component.parent = this;
 		if (this.massOverridden && this.overrideSubcomponentsMass) {
@@ -1757,18 +1773,48 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
 				child.CDOverriddenBy = component.CDOverriddenBy;
 			}
 		}
-		
+
-		if (component instanceof AxialStage) {
+		if (trackStage && (component instanceof AxialStage)) {
 			AxialStage nStage = (AxialStage) component;
 			this.getRocket().trackStage(nStage);
 		}
-		
+
 		this.checkComponentStructure();
 		component.checkComponentStructure();
-		
+
 		fireAddRemoveEvent(component);
 	}
 	
+	/**
+	 * Adds a child to the rocket component tree.  The component is added to
+	 * the given position of the component's child list.
+	 * <p>
+	 * This method may be overridden to enforce more strict component addition rules.
+	 * The tests should be performed first and then this method called.
+	 *
+	 * @param component	The component to add.
+	 * @param index		Position to add component to.
+	 * @throws IllegalArgumentException  If the component is already part of
+	 * 									 some component tree.
+	 */
+	public void addChild(RocketComponent component, int index) {
+		addChild(component, index, true);
+	}
+
+	/**
+	 * Removes a child from the rocket component tree.
+	 * (redirect to the removed-by-component
+	 *
+	 * @param n  remove the n'th child.
+	 * @param trackStage If component is a stage, this check will decide whether the rocket should track that stage (remove it to the stageList etc.)
+	 * @throws IndexOutOfBoundsException  if n is out of bounds
+	 */
+	public final void removeChild(int n, boolean trackStage) {
+		checkState();
+		RocketComponent component = this.getChild(n);
+		this.removeChild(component, trackStage);
+	}
+	
 	/**
 	 * Removes a child from the rocket component tree.
 	 * (redirect to the removed-by-component
@@ -1777,9 +1823,7 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
 	 * @throws IndexOutOfBoundsException  if n is out of bounds
 	 */
 	public final void removeChild(int n) {
-		checkState();
+		removeChild(n, true);
-		RocketComponent component = this.getChild(n);
-		this.removeChild(component);
 	}
 	
 	/**
@@ -1787,9 +1831,10 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
 	 * is not present as a child.
 	 *
 	 * @param component		the component to remove
+	 * @param trackStage If component is a stage, this check will decide whether the rocket should track that stage (remove it to the stageList etc.)
 	 * @return				whether the component was a child
 	 */
-	public final boolean removeChild(RocketComponent component) {
+	public final boolean removeChild(RocketComponent component, boolean trackStage) {
 		checkState();
 		
 		component.checkComponentStructure();
@@ -1811,15 +1856,17 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
 					c.CDOverriddenBy = null;
 				}
 			}
-			
-			if (component instanceof AxialStage) {
-				AxialStage stage = (AxialStage) component;
-				this.getRocket().forgetStage(stage);
-			}
 
-			// Remove sub-stages of the removed component
+			if (trackStage) {
-			for (AxialStage stage : component.getSubStages()) {
+				if (component instanceof AxialStage) {
-				this.getRocket().forgetStage(stage);
+					AxialStage stage = (AxialStage) component;
+					this.getRocket().forgetStage(stage);
+				}
+
+				// Remove sub-stages of the removed component
+				for (AxialStage stage : component.getSubStages()) {
+					this.getRocket().forgetStage(stage);
+				}
 			}
 			
 			this.checkComponentStructure();
@@ -1832,6 +1879,17 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
 		}
 		return false;
 	}
+
+	/**
+	 * Removes a child from the rocket component tree.  Does nothing if the component
+	 * is not present as a child.
+	 *
+	 * @param component		the component to remove
+	 * @return				whether the component was a child
+	 */
+	public final boolean removeChild(RocketComponent component) {
+		return removeChild(component, true);
+	}
 	
 	
 	

swing/src/net/sf/openrocket/gui/main/OpenRocketClipboard.java

@@ -101,7 +101,7 @@ public final class OpenRocketClipboard {
 		if (someChildrenSelected) {
 			for (RocketComponent child : component.getChildren()) {
 				if (!clipboardComponents.contains(child)) {
-					component.removeChild(child);
+					component.removeChild(child, false);
 				} else {
 					clipboardComponents.remove(child);
 					filterClipboardComponents(child.getChildren());

swing/src/net/sf/openrocket/gui/main/RocketActions.java

@@ -337,7 +337,7 @@ public class RocketActions {
 				RocketComponent originalParent = components.get(i).getParent();
 				int originalParentIdx = components.indexOf(originalParent);
 
-				result.get(originalParentIdx).addChild(result.get(i));
+				result.get(originalParentIdx).addChild(result.get(i), false);
 			} else if (RocketComponent.listContainsParent(components, components.get(i))){
 				RocketComponent originalParent = components.get(i);
 				while (originalParent != components.get(i)) {
@@ -346,7 +346,7 @@ public class RocketActions {
 					}
 				}
 				int originalParentIdx = components.indexOf(originalParent);
-				result.get(originalParentIdx).addChild(result.get(i));
+				result.get(originalParentIdx).addChild(result.get(i), false);
 			}
 		}