Updated Branches: refs/heads/wicket-1.5.x 2a6a2888e -> 3122a2db9
Move a check earlier so we do not do work which will be ignored. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3122a2db Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3122a2db Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3122a2db Branch: refs/heads/wicket-1.5.x Commit: 3122a2db9b3c960c504db7eb2862eb08ea052d47 Parents: 5f55334 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Jun 15 11:53:24 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Jun 15 11:53:24 2012 +0300 ---------------------------------------------------------------------- .../markup/parser/filter/WicketTagIdentifier.java | 20 +++++++------- 1 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/3122a2db/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 45b7ab9..a35db41 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 @@ -81,6 +81,15 @@ public final class WicketTagIdentifier extends AbstractMarkupFilter // It is <wicket:...> tag = new WicketTag(tag.getXmlTag()); + // If the tag is not a well-known wicket namespace tag + if (!isWellKnown(tag)) + { + // give up + throw new WicketParseException("Unknown tag name with Wicket namespace: '" + + tag.getName() + "'. Might be you haven't installed the appropriate resolver?", + tag); + } + if (Strings.isEmpty(wicketIdValue)) { // Make it a Wicket component. Otherwise it would be RawMarkup @@ -88,15 +97,6 @@ public final class WicketTagIdentifier extends AbstractMarkupFilter tag.setAutoComponentTag(true); tag.setModified(true); } - - // If the tag is not a well-known wicket namespace tag - if (!isWellKnown(tag)) - { - // give up - throw new WicketParseException("Unknown tag name with Wicket namespace: '" + - tag.getName() + "'. Might be you haven't installed the appropriate resolver?", - tag); - } } if (wicketIdValue != null) @@ -119,7 +119,7 @@ public final class WicketTagIdentifier extends AbstractMarkupFilter * * @param name */ - public final static void registerWellKnownTagName(final String name) + public static void registerWellKnownTagName(final String name) { if (wellKnownTagNames == null) {
