Updated Branches: refs/heads/master 0a15cb53d -> 90c2b1812
Replace usages of java.util.Stack with java.util.Deque Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/90c2b181 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/90c2b181 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/90c2b181 Branch: refs/heads/master Commit: 90c2b18127ff9f902d1ac2c4cf147c1f346d0098 Parents: 0a15cb5 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Jan 22 12:04:11 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Jan 22 12:04:11 2014 +0200 ---------------------------------------------------------------------- .../org/apache/wicket/threadtest/apps/app2/Pool.java | 5 +++-- .../objects/checker/CheckingObjectOutputStream.java | 5 +++-- .../wicket/markup/parser/filter/EnclosureHandler.java | 8 +++++--- .../markup/parser/filter/InlineEnclosureHandler.java | 13 ++++++++----- 4 files changed, 19 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/90c2b181/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/Pool.java ---------------------------------------------------------------------- diff --git a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/Pool.java b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/Pool.java index b654a01..3954b53 100644 --- a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/Pool.java +++ b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/Pool.java @@ -16,7 +16,8 @@ */ package org.apache.wicket.threadtest.apps.app2; -import java.util.Stack; +import java.util.ArrayDeque; +import java.util.Deque; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,7 +59,7 @@ public class Pool private final Connection[] allConnections; - private final Stack<Connection> available = new Stack<Connection>(); + private final Deque<Connection> available = new ArrayDeque<Connection>(); private final ThreadLocal<Connection> locks = new ThreadLocal<Connection>(); http://git-wip-us.apache.org/repos/asf/wicket/blob/90c2b181/wicket-core/src/main/java/org/apache/wicket/core/util/objects/checker/CheckingObjectOutputStream.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/objects/checker/CheckingObjectOutputStream.java b/wicket-core/src/main/java/org/apache/wicket/core/util/objects/checker/CheckingObjectOutputStream.java index bf56d41..5113c48 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/util/objects/checker/CheckingObjectOutputStream.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/util/objects/checker/CheckingObjectOutputStream.java @@ -27,14 +27,15 @@ import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; +import java.util.ArrayDeque; import java.util.Date; +import java.util.Deque; import java.util.HashSet; import java.util.IdentityHashMap; import java.util.Iterator; import java.util.LinkedList; import java.util.Map; import java.util.Set; -import java.util.Stack; import org.apache.wicket.Component; import org.apache.wicket.WicketRuntimeException; @@ -311,7 +312,7 @@ public class CheckingObjectOutputStream extends ObjectOutputStream /** current full field description. */ private String fieldDescription; - private final Stack<Object> stack = new Stack<Object>(); + private final Deque<Object> stack = new ArrayDeque<>(); /** * Constructor. http://git-wip-us.apache.org/repos/asf/wicket/blob/90c2b181/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java index 09aa6e7..25b1747 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java @@ -17,6 +17,8 @@ package org.apache.wicket.markup.parser.filter; import java.text.ParseException; +import java.util.ArrayDeque; +import java.util.Deque; import java.util.Stack; import org.apache.wicket.Component; @@ -58,7 +60,7 @@ public final class EnclosureHandler extends AbstractMarkupFilter implements ICom public static final String CHILD_ATTRIBUTE = "child"; /** Stack of <wicket:enclosure> tags */ - private Stack<ComponentTag> stack; + private Deque<ComponentTag> stack; /** The id of the first wicket tag inside the enclosure */ private String childId; @@ -90,7 +92,7 @@ public final class EnclosureHandler extends AbstractMarkupFilter implements ICom { if (stack == null) { - stack = new Stack<ComponentTag>(); + stack = new ArrayDeque<>(); } stack.push(tag); } @@ -128,7 +130,7 @@ public final class EnclosureHandler extends AbstractMarkupFilter implements ICom // Are we inside a wicket:enclosure tag? else if (stack != null) { - ComponentTag lastEnclosure = stack.lastElement(); + ComponentTag lastEnclosure = stack.getLast(); // If the enclosure tag has NO child attribute, then ... if (lastEnclosure.getAttribute(CHILD_ATTRIBUTE) == null) http://git-wip-us.apache.org/repos/asf/wicket/blob/90c2b181/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.java index 1cc9a59..5eb94fc 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.java @@ -17,7 +17,9 @@ package org.apache.wicket.markup.parser.filter; import java.text.ParseException; -import java.util.Stack; +import java.util.ArrayDeque; +import java.util.Deque; +import java.util.Iterator; import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; @@ -62,7 +64,7 @@ public final class InlineEnclosureHandler extends AbstractMarkupFilter public final static String INLINE_ENCLOSURE_ATTRIBUTE_NAME = "enclosure"; /** enclosures inside enclosures */ - private Stack<ComponentTag> enclosures; + private Deque<ComponentTag> enclosures; /** * InlineEnclosures are not removed after render as other auto-components, @@ -128,7 +130,7 @@ public final class InlineEnclosureHandler extends AbstractMarkupFilter // Put the enclosure on the stack. The most current one will be on top if (enclosures == null) { - enclosures = new Stack<ComponentTag>(); + enclosures = new ArrayDeque<>(); } enclosures.push(tag); } @@ -147,9 +149,10 @@ public final class InlineEnclosureHandler extends AbstractMarkupFilter if (tag.isOpen() && (tag.getId() != null) && !(tag instanceof WicketTag) && !tag.isAutoComponentTag()) { - for (int i = enclosures.size() - 1; i >= 0; i--) + Iterator<ComponentTag> componentTagIterator = enclosures.descendingIterator(); + while (componentTagIterator.hasNext()) { - ComponentTag lastEnclosure = enclosures.get(i); + ComponentTag lastEnclosure = componentTagIterator.next(); String attr = getAttribute(lastEnclosure, null); if (Strings.isEmpty(attr) == true) {
