From 58b742d5d9b057732741a97fc9c76ee30269b148 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sat, 1 Feb 2014 13:47:04 +0100 Subject: [PATCH] [Minor] using Deque instead of Stack --- .../privilege/xml/PrivilegeConfigSaxReader.java | 11 ++++++----- .../privilege/xml/PrivilegeModelSaxReader.java | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/ch/eitchnet/privilege/xml/PrivilegeConfigSaxReader.java b/src/main/java/ch/eitchnet/privilege/xml/PrivilegeConfigSaxReader.java index f7e09a822..c1b31c5a2 100644 --- a/src/main/java/ch/eitchnet/privilege/xml/PrivilegeConfigSaxReader.java +++ b/src/main/java/ch/eitchnet/privilege/xml/PrivilegeConfigSaxReader.java @@ -15,9 +15,10 @@ */ package ch.eitchnet.privilege.xml; +import java.util.ArrayDeque; +import java.util.Deque; import java.util.HashMap; import java.util.Map; -import java.util.Stack; import org.xml.sax.Attributes; import org.xml.sax.SAXException; @@ -33,7 +34,7 @@ public class PrivilegeConfigSaxReader extends DefaultHandler { // private static final Logger logger = LoggerFactory.getLogger(PrivilegeConfigSaxReader.class); - private Stack buildersStack = new Stack(); + private Deque buildersStack = new ArrayDeque(); private PrivilegeContainerModel containerModel; @@ -49,11 +50,11 @@ public class PrivilegeConfigSaxReader extends DefaultHandler { public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { if (qName.equals(XmlConstants.XML_CONTAINER)) { - this.buildersStack.add(new ContainerParser()); + this.buildersStack.push(new ContainerParser()); } else if (qName.equals(XmlConstants.XML_PARAMETERS)) { - this.buildersStack.add(new ParametersParser()); + this.buildersStack.push(new ParametersParser()); } else if (qName.equals(XmlConstants.XML_POLICIES)) { - this.buildersStack.add(new PoliciesParser()); + this.buildersStack.push(new PoliciesParser()); } if (!this.buildersStack.isEmpty()) diff --git a/src/main/java/ch/eitchnet/privilege/xml/PrivilegeModelSaxReader.java b/src/main/java/ch/eitchnet/privilege/xml/PrivilegeModelSaxReader.java index dd5b83278..1ac89649e 100644 --- a/src/main/java/ch/eitchnet/privilege/xml/PrivilegeModelSaxReader.java +++ b/src/main/java/ch/eitchnet/privilege/xml/PrivilegeModelSaxReader.java @@ -16,14 +16,15 @@ package ch.eitchnet.privilege.xml; import java.text.MessageFormat; +import java.util.ArrayDeque; import java.util.ArrayList; +import java.util.Deque; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; -import java.util.Stack; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +47,7 @@ public class PrivilegeModelSaxReader extends DefaultHandler { protected static final Logger logger = LoggerFactory.getLogger(PrivilegeModelSaxReader.class); - private Stack buildersStack = new Stack(); + private Deque buildersStack = new ArrayDeque(); private List users; private List roles; @@ -76,12 +77,12 @@ public class PrivilegeModelSaxReader extends DefaultHandler { public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { if (qName.equals(XmlConstants.XML_USER)) { - this.buildersStack.add(new UserParser()); + this.buildersStack.push(new UserParser()); this.insideUser = true; } else if (qName.equals(XmlConstants.XML_PROPERTIES)) { - this.buildersStack.add(new PropertyParser()); + this.buildersStack.push(new PropertyParser()); } else if (qName.equals(XmlConstants.XML_ROLE) && !this.insideUser) { - this.buildersStack.add(new RoleParser()); + this.buildersStack.push(new RoleParser()); } if (!this.buildersStack.isEmpty())