Change from java.util.ArrayDeque to net.sf.openrocket.util.SimpleStack since the...

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/branches/froyo_12.03@485 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/core/src/net/sf/openrocket/file/simplesax/DelegatorHandler.java b/core/src/net/sf/openrocket/file/simplesax/DelegatorHandler.java
index d5c1f37312df9c759bbb3bf7ef09bf6c66234120..169a4d707208a460a66f2e2ce1c6e1c6534918a1 100644 (file)
--- a/core/src/net/sf/openrocket/file/simplesax/DelegatorHandler.java
+++ b/core/src/net/sf/openrocket/file/simplesax/DelegatorHandler.java
@@ -1,11 +1,10 @@
 package net.sf.openrocket.file.simplesax;
 
-import java.util.ArrayDeque;
-import java.util.Deque;
 import java.util.HashMap;
 
 import net.sf.openrocket.aerodynamics.Warning;
 import net.sf.openrocket.aerodynamics.WarningSet;
+import net.sf.openrocket.util.SimpleStack;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
@@ -18,9 +17,9 @@ import org.xml.sax.helpers.DefaultHandler;
 class DelegatorHandler extends DefaultHandler {
        private final WarningSet warnings;
        
-       private final Deque<ElementHandler> handlerStack = new ArrayDeque<ElementHandler>();
-       private final Deque<StringBuilder> elementData = new ArrayDeque<StringBuilder>();
-       private final Deque<HashMap<String, String>> elementAttributes = new ArrayDeque<HashMap<String, String>>();
+       private final SimpleStack<ElementHandler> handlerStack = new SimpleStack<ElementHandler>();
+       private final SimpleStack<StringBuilder> elementData = new SimpleStack<StringBuilder>();
+       private final SimpleStack<HashMap<String, String>> elementAttributes = new SimpleStack<HashMap<String, String>>();
        
        
        // Ignore all elements as long as ignore > 0

diff --git a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
index b1a57dbfc8e7445a75a8b30bd926f126b3bbc519..9ea7374caf9afe7ddb84b69492c54c5aecded7a8 100644 (file)
--- a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
@@ -1,8 +1,6 @@
 package net.sf.openrocket.rocketcomponent;
 
-import java.util.ArrayDeque;
 import java.util.Collection;
-import java.util.Deque;
 import java.util.EventListener;
 import java.util.Iterator;
 import java.util.List;
@@ -21,6 +19,7 @@ import net.sf.openrocket.util.Invalidator;
 import net.sf.openrocket.util.LineStyle;
 import net.sf.openrocket.util.MathUtil;
 import net.sf.openrocket.util.SafetyMutex;
+import net.sf.openrocket.util.SimpleStack;
 import net.sf.openrocket.util.UniqueID;
 
 
@@ -1815,7 +1814,7 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
         */
        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;