From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Wed, 18 Jul 2012 14:42:27 +0000 (+0000)
Subject: Merge branches/froyo_12.03 to head.
X-Git-Tag: upstream/12.09^2~102
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=953ac8ca75bc3bdcb9db8a382c7b3d63c795b27a;p=debian%2Fopenrocket

Merge branches/froyo_12.03 to head.


git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@899 180e2498-e6e9-4542-8430-84ac67f01cd8
---

953ac8ca75bc3bdcb9db8a382c7b3d63c795b27a
diff --cc core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
index b27fbbb0,9ea7374c..9000a540
--- a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
@@@ -1853,17 -1814,17 +1852,17 @@@ public abstract class RocketComponent i
  	 */
  	private static class RocketComponentIterator implements Iterator<RocketComponent> {
  		// Stack holds iterators which still have some components left.
- 		private final Deque<Iterator<RocketComponent>> iteratorStack = new ArrayDeque<Iterator<RocketComponent>>();
+ 		private final SimpleStack<Iterator<RocketComponent>> iteratorStack = new SimpleStack<Iterator<RocketComponent>>();
 -		
 +
  		private final Rocket root;
  		private final int treeModID;
 -		
 +
  		private final RocketComponent original;
  		private boolean returnSelf = false;
 -		
 +
  		// Construct iterator with component's child's iterator, if it has elements
  		public RocketComponentIterator(RocketComponent c, boolean returnSelf) {
 -			
 +
  			RocketComponent gp = c.getRoot();
  			if (gp instanceof Rocket) {
  				root = (Rocket) gp;