You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/05/15 10:16:09 UTC
[2/2] git commit: WICKET-5189 preregister known wicket tag names
WICKET-5189 preregister known wicket tag names
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/27ac13df
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/27ac13df
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/27ac13df
Branch: refs/heads/master
Commit: 27ac13df10ffc225091f8c0b6c77aa65e4a61034
Parents: 217758e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed May 15 11:14:56 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed May 15 11:14:56 2013 +0300
----------------------------------------------------------------------
.../wicket/markup/html/border/BorderBehavior.java | 10 +----
.../markup/html/form/AutoLabelTextResolver.java | 6 +--
.../markup/html/form/FormComponentPanel.java | 11 ----
.../html/panel/BorderMarkupSourcingStrategy.java | 8 ---
.../html/panel/PanelMarkupSourcingStrategy.java | 8 ---
.../markup/parser/filter/EnclosureHandler.java | 6 --
.../markup/parser/filter/WicketLinkTagHandler.java | 6 --
.../parser/filter/WicketRemoveTagHandler.java | 6 --
.../markup/parser/filter/WicketTagIdentifier.java | 37 +++++++++++----
.../wicket/markup/resolver/FragmentResolver.java | 7 ---
.../wicket/markup/resolver/HtmlHeaderResolver.java | 6 --
.../markup/resolver/MarkupInheritanceResolver.java | 8 ---
.../markup/resolver/WicketContainerResolver.java | 7 ---
.../markup/resolver/WicketMessageResolver.java | 9 +---
.../org/apache/wicket/markup/MarkupParserTest.java | 4 --
15 files changed, 31 insertions(+), 108 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/27ac13df/wicket-core/src/main/java/org/apache/wicket/markup/html/border/BorderBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/BorderBehavior.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/BorderBehavior.java
index dd18399..ecb15b8 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/BorderBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/BorderBehavior.java
@@ -24,6 +24,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.core.util.resource.locator.IResourceStreamLocator;
import org.apache.wicket.markup.ContainerInfo;
import org.apache.wicket.markup.IMarkupFragment;
import org.apache.wicket.markup.MarkupElement;
@@ -32,10 +33,8 @@ import org.apache.wicket.markup.MarkupResourceStream;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.MarkupType;
import org.apache.wicket.markup.WicketTag;
-import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
import org.apache.wicket.request.Response;
import org.apache.wicket.util.resource.IResourceStream;
-import org.apache.wicket.core.util.resource.locator.IResourceStreamLocator;
/**
* This is a behavior implementation that can be used if you have markup that should be around a
@@ -47,13 +46,6 @@ import org.apache.wicket.core.util.resource.locator.IResourceStreamLocator;
*/
public class BorderBehavior extends Behavior
{
- static
- {
- // register "wicket:border" and "wicket:body"
- WicketTagIdentifier.registerWellKnownTagName(Border.BORDER);
- WicketTagIdentifier.registerWellKnownTagName(Border.BODY);
- }
-
private static final long serialVersionUID = 1L;
// markup stream associated with this border. bonus of keeping a reference
http://git-wip-us.apache.org/repos/asf/wicket/blob/27ac13df/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelTextResolver.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelTextResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelTextResolver.java
index 0fe4ee9..7d1febf 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelTextResolver.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelTextResolver.java
@@ -26,7 +26,6 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.AutoLabelResolver.AutoLabel;
import org.apache.wicket.markup.html.internal.ResponseBufferZone;
import org.apache.wicket.markup.parser.XmlTag;
-import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
import org.apache.wicket.markup.resolver.IComponentResolver;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
@@ -99,10 +98,7 @@ import org.apache.wicket.util.string.Strings;
*/
public class AutoLabelTextResolver implements IComponentResolver
{
- static
- {
- WicketTagIdentifier.registerWellKnownTagName("label");
- }
+ public static final String LABEL = "label";
/**
* This is inserted by the resolver to render the label.
http://git-wip-us.apache.org/repos/asf/wicket/blob/27ac13df/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java
index 1528de3..2a00773 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java
@@ -18,9 +18,7 @@ package org.apache.wicket.markup.html.form;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.panel.IMarkupSourcingStrategy;
-import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.html.panel.PanelMarkupSourcingStrategy;
-import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
import org.apache.wicket.model.IModel;
/**
@@ -114,15 +112,6 @@ public abstract class FormComponentPanel<T> extends FormComponent<T>
{
private static final long serialVersionUID = 1L;
- static
- {
- // register "wicket:panel"
- // Same as in Panel.java. Not that it can be moved in the PanelMarkupSourcingStrategy which
- // provides common functionality for Panel and FormComponentPanel, since the sourcing
- // strategy gets lazy loaded. Too late as some users found out.
- WicketTagIdentifier.registerWellKnownTagName(Panel.PANEL);
- }
-
/**
* Construct.
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/27ac13df/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/BorderMarkupSourcingStrategy.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/BorderMarkupSourcingStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/BorderMarkupSourcingStrategy.java
index 122374f..e8db010 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/BorderMarkupSourcingStrategy.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/BorderMarkupSourcingStrategy.java
@@ -22,7 +22,6 @@ import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.IMarkupFragment;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.border.Border;
-import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
/**
* The Border component's markup sourcing strategy
@@ -32,13 +31,6 @@ import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
public class BorderMarkupSourcingStrategy extends AssociatedMarkupSourcingStrategy
{
- static
- {
- // register "wicket:body" and "wicket:border"
- WicketTagIdentifier.registerWellKnownTagName(Border.BORDER);
- WicketTagIdentifier.registerWellKnownTagName(Border.BODY);
- }
-
/**
* Constructor.
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/27ac13df/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/PanelMarkupSourcingStrategy.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/PanelMarkupSourcingStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/PanelMarkupSourcingStrategy.java
index a5a8f06..50c80c7 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/PanelMarkupSourcingStrategy.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/PanelMarkupSourcingStrategy.java
@@ -20,7 +20,6 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupException;
import org.apache.wicket.markup.MarkupStream;
-import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
/**
* The Panel components markup sourcing strategy.
@@ -37,13 +36,6 @@ public class PanelMarkupSourcingStrategy extends AssociatedMarkupSourcingStrateg
// False for Panel and true for Border components.
private final boolean allowWicketComponentsInBodyMarkup;
- static
- {
- // register "wicket:panel"
- WicketTagIdentifier.registerWellKnownTagName(Panel.PANEL);
- }
-
-
/**
* Constructor.
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/27ac13df/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 3099c39..09aa6e7 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
@@ -57,12 +57,6 @@ public final class EnclosureHandler extends AbstractMarkupFilter implements ICom
/** The child attribute */
public static final String CHILD_ATTRIBUTE = "child";
- static
- {
- // register "wicket:enclosure"
- WicketTagIdentifier.registerWellKnownTagName(ENCLOSURE);
- }
-
/** Stack of <wicket:enclosure> tags */
private Stack<ComponentTag> stack;
http://git-wip-us.apache.org/repos/asf/wicket/blob/27ac13df/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java
index 2efe39f..db5200b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java
@@ -60,12 +60,6 @@ public class WicketLinkTagHandler extends AbstractMarkupFilter implements ICompo
/** The id of autolink components */
public static final String AUTOLINK_ID = "_autolink_";
- static
- {
- // register "wicket:link"
- WicketTagIdentifier.registerWellKnownTagName(LINK);
- }
-
/** Allow to have link regions within link regions */
private ArrayListStack<Boolean> autolinkStatus;
http://git-wip-us.apache.org/repos/asf/wicket/blob/27ac13df/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketRemoveTagHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketRemoveTagHandler.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketRemoveTagHandler.java
index b7282f1..8ad11c8 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketRemoveTagHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketRemoveTagHandler.java
@@ -38,12 +38,6 @@ public final class WicketRemoveTagHandler extends AbstractMarkupFilter
/** */
public static final String REMOVE = "remove";
- static
- {
- // register "wicket:remove"
- WicketTagIdentifier.registerWellKnownTagName(REMOVE);
- }
-
/**
* Construct.
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/27ac13df/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 620aed5..1541789 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
@@ -26,7 +26,15 @@ import org.apache.wicket.markup.MarkupElement;
import org.apache.wicket.markup.MarkupResourceStream;
import org.apache.wicket.markup.WicketParseException;
import org.apache.wicket.markup.WicketTag;
+import org.apache.wicket.markup.html.border.Border;
+import org.apache.wicket.markup.html.form.AutoLabelTextResolver;
+import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.parser.AbstractMarkupFilter;
+import org.apache.wicket.markup.resolver.FragmentResolver;
+import org.apache.wicket.markup.resolver.HtmlHeaderResolver;
+import org.apache.wicket.markup.resolver.MarkupInheritanceResolver;
+import org.apache.wicket.markup.resolver.WicketContainerResolver;
+import org.apache.wicket.markup.resolver.WicketMessageResolver;
import org.apache.wicket.util.string.Strings;
@@ -44,7 +52,23 @@ import org.apache.wicket.util.string.Strings;
public final class WicketTagIdentifier extends AbstractMarkupFilter
{
/** List of well known wicket tag names */
- private static Set<String> wellKnownTagNames;
+ private static final Set<String> WELL_KNOWN_TAG_NAMES = new HashSet<>();
+
+ static {
+ WELL_KNOWN_TAG_NAMES.add(Border.BORDER);
+ WELL_KNOWN_TAG_NAMES.add(Border.BODY);
+ WELL_KNOWN_TAG_NAMES.add(AutoLabelTextResolver.LABEL);
+ WELL_KNOWN_TAG_NAMES.add(Panel.PANEL);
+ WELL_KNOWN_TAG_NAMES.add(EnclosureHandler.ENCLOSURE);
+ WELL_KNOWN_TAG_NAMES.add(WicketLinkTagHandler.LINK);
+ WELL_KNOWN_TAG_NAMES.add(WicketRemoveTagHandler.REMOVE);
+ WELL_KNOWN_TAG_NAMES.add(FragmentResolver.FRAGMENT);
+ WELL_KNOWN_TAG_NAMES.add(HtmlHeaderResolver.HEAD);
+ WELL_KNOWN_TAG_NAMES.add(MarkupInheritanceResolver.CHILD);
+ WELL_KNOWN_TAG_NAMES.add(MarkupInheritanceResolver.EXTEND);
+ WELL_KNOWN_TAG_NAMES.add(WicketContainerResolver.CONTAINER);
+ WELL_KNOWN_TAG_NAMES.add(WicketMessageResolver.MESSAGE);
+ }
/**
* Construct.
@@ -124,15 +148,10 @@ 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)
- {
- wellKnownTagNames = new HashSet<>();
- }
-
String lowerCaseName = name.toLowerCase(Locale.ENGLISH);
- wellKnownTagNames.add(lowerCaseName);
+ WELL_KNOWN_TAG_NAMES.add(lowerCaseName);
}
/**
@@ -143,6 +162,6 @@ public final class WicketTagIdentifier extends AbstractMarkupFilter
private boolean isWellKnown(final ComponentTag tag)
{
String lowerCaseTagName = tag.getName().toLowerCase(Locale.ENGLISH);
- return wellKnownTagNames.contains(lowerCaseTagName);
+ return WELL_KNOWN_TAG_NAMES.contains(lowerCaseTagName);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/27ac13df/wicket-core/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java
index e78dd43..974fdf8 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java
@@ -22,7 +22,6 @@ import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.WicketTag;
import org.apache.wicket.markup.html.WebComponent;
-import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
/**
* Usually you either have a markup file or a xml tag with wicket:id="myComponent" to associate
@@ -43,12 +42,6 @@ public class FragmentResolver implements IComponentResolver
/** */
public static final String FRAGMENT = "fragment";
- static
- {
- // register "wicket:fragment"
- WicketTagIdentifier.registerWellKnownTagName(FRAGMENT);
- }
-
@Override
public Component resolve(final MarkupContainer container, final MarkupStream markupStream,
final ComponentTag tag)
http://git-wip-us.apache.org/repos/asf/wicket/blob/27ac13df/wicket-core/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
index 3c56d5f..4688b12 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
@@ -51,12 +51,6 @@ public class HtmlHeaderResolver implements IComponentResolver
/** */
public static final String HEAD = "head";
- static
- {
- // register "wicket:head"
- WicketTagIdentifier.registerWellKnownTagName(HEAD);
- }
-
@Override
public Component resolve(final MarkupContainer container, final MarkupStream markupStream,
final ComponentTag tag)
http://git-wip-us.apache.org/repos/asf/wicket/blob/27ac13df/wicket-core/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java
index 8800e4d..78d011c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java
@@ -22,7 +22,6 @@ import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.WicketTag;
import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
-import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
/**
* Detect <wicket:extend> and <wicket:child> tags, which are silently ignored, because
@@ -40,13 +39,6 @@ public class MarkupInheritanceResolver implements IComponentResolver
/** */
public static final String EXTEND = "extend";
- static
- {
- // register "wicket:extend" and "wicket:child"
- WicketTagIdentifier.registerWellKnownTagName(EXTEND);
- WicketTagIdentifier.registerWellKnownTagName(CHILD);
- }
-
/**
* @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(org.apache.wicket.MarkupContainer,
* org.apache.wicket.markup.MarkupStream, org.apache.wicket.markup.ComponentTag)
http://git-wip-us.apache.org/repos/asf/wicket/blob/27ac13df/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java
index 5d65c03..562843d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java
@@ -21,7 +21,6 @@ import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.WicketTag;
-import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,12 +67,6 @@ public class WicketContainerResolver implements IComponentResolver
/** */
public static final String CONTAINER = "container";
- static
- {
- // register "wicket:container"
- WicketTagIdentifier.registerWellKnownTagName(CONTAINER);
- }
-
@Override
public Component resolve(final MarkupContainer container, final MarkupStream markupStream,
final ComponentTag tag)
http://git-wip-us.apache.org/repos/asf/wicket/blob/27ac13df/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
index f147539..6c83532 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
@@ -23,17 +23,16 @@ import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.core.util.lang.PropertyResolver;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupElement;
import org.apache.wicket.markup.MarkupException;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.WicketTag;
import org.apache.wicket.markup.parser.XmlTag.TagType;
-import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.Response;
import org.apache.wicket.response.StringResponse;
-import org.apache.wicket.core.util.lang.PropertyResolver;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.string.interpolator.MapVariableInterpolator;
import org.slf4j.Logger;
@@ -98,12 +97,6 @@ public class WicketMessageResolver implements IComponentResolver
/** */
public static final String MESSAGE = "message";
- static
- {
- // register "wicket:message"
- WicketTagIdentifier.registerWellKnownTagName(MESSAGE);
- }
-
/**
* If the key can't be resolved and the default is null, an exception will be thrown. Instead,
* we default to a unique string and check against this later. Don't just use an empty string
http://git-wip-us.apache.org/repos/asf/wicket/blob/27ac13df/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
index e09d4ad..11aa0d5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
@@ -281,10 +281,6 @@ public final class MarkupParserTest extends WicketTestCase
@Test
public void wicketTag() throws ParseException, ResourceStreamNotFoundException, IOException
{
- WicketTagIdentifier.registerWellKnownTagName("body");
- WicketTagIdentifier.registerWellKnownTagName("border");
- WicketTagIdentifier.registerWellKnownTagName("panel");
-
new MarkupParser("<span wicket:id=\"test\"/>").parse();
new MarkupParser("<span wicket:id=\"test\">Body</span>").parse();
new MarkupParser("This is a test <span wicket:id=\"test\"/>").parse();