Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / core / src / net / sf / openrocket / file / simplesax / DelegatorHandler.java

diff --git a/core/src/net/sf/openrocket/file/simplesax/DelegatorHandler.java b/core/src/net/sf/openrocket/file/simplesax/DelegatorHandler.java
index 0b88640ca683ad5a6611bc1fc4dd2f8174599f14..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;
@@ -13,21 +12,21 @@ import org.xml.sax.helpers.DefaultHandler;
 
 /**
  * The actual SAX handler class.  Contains the necessary methods for parsing the SAX source.
- * Delegates the actual content parsing to {@link AbstractElementHandler} objects.
+ * Delegates the actual content parsing to {@link ElementHandler} objects.
  */
 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
        private int ignore = 0;
        
        
-       public DelegatorHandler(AbstractElementHandler initialHandler, WarningSet warnings) {
+       public DelegatorHandler(ElementHandler initialHandler, WarningSet warnings) {
                this.warnings = warnings;
                handlerStack.add(initialHandler);
                elementData.add(new StringBuilder()); // Just in case