Updated Branches: refs/heads/master 8bf5f6c22 -> 0cf827fae
WICKET-4887 Use a Set to keep the supported wicket elements in WicketTagIdentifier Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0cf827fa Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0cf827fa Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0cf827fa Branch: refs/heads/master Commit: 0cf827faede8310271db35e537d47f93489286ac Parents: 8bf5f6c Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Nov 29 13:46:01 2012 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Nov 29 13:46:01 2012 +0100 ---------------------------------------------------------------------- .../markup/parser/filter/WicketTagIdentifier.java | 25 +++++--------- 1 files changed, 9 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/0cf827fa/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java index 4b387f7..d2ddcb9 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java @@ -17,8 +17,9 @@ package org.apache.wicket.markup.parser.filter; import java.text.ParseException; -import java.util.ArrayList; -import java.util.List; +import java.util.HashSet; +import java.util.Locale; +import java.util.Set; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.MarkupElement; @@ -43,7 +44,7 @@ import org.apache.wicket.util.string.Strings; public final class WicketTagIdentifier extends AbstractMarkupFilter { /** List of well known wicket tag names */ - private static List<String> wellKnownTagNames; + private static Set<String> wellKnownTagNames; /** * Construct. @@ -127,13 +128,11 @@ public final class WicketTagIdentifier extends AbstractMarkupFilter { if (wellKnownTagNames == null) { - wellKnownTagNames = new ArrayList<String>(); + wellKnownTagNames = new HashSet<String>(); } - if (wellKnownTagNames.contains(name) == false) - { - wellKnownTagNames.add(name); - } + String lowerCaseName = name.toLowerCase(Locale.ENGLISH); + wellKnownTagNames.add(lowerCaseName); } /** @@ -143,13 +142,7 @@ public final class WicketTagIdentifier extends AbstractMarkupFilter */ private boolean isWellKnown(final ComponentTag tag) { - for (String name : wellKnownTagNames) - { - if (tag.getName().equalsIgnoreCase(name)) - { - return true; - } - } - return false; + String lowerCaseTagName = tag.getName().toLowerCase(Locale.ENGLISH); + return wellKnownTagNames.contains(lowerCaseTagName); } }
