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/14 13:52:41 UTC
git commit: WICKET-5187 Unknown tag name with Wicket namespace:
'panel'
Updated Branches:
refs/heads/master 81f5647c1 -> 10ea373b8
WICKET-5187 Unknown tag name with Wicket namespace: 'panel'
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/10ea373b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/10ea373b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/10ea373b
Branch: refs/heads/master
Commit: 10ea373b89b619da3f198a7e4c1072ec038a082f
Parents: 81f5647
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue May 14 14:51:43 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue May 14 14:51:43 2013 +0300
----------------------------------------------------------------------
.../apache/wicket/markup/html/border/Border.java | 8 --------
.../html/panel/BorderMarkupSourcingStrategy.java | 9 +++++++++
.../org/apache/wicket/markup/html/panel/Panel.java | 6 ------
.../html/panel/PanelMarkupSourcingStrategy.java | 8 ++++++++
4 files changed, 17 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/10ea373b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java
index 37bdd23..705c124 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java
@@ -29,7 +29,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.BorderMarkupSourcingStrategy;
import org.apache.wicket.markup.html.panel.IMarkupSourcingStrategy;
import org.apache.wicket.markup.parser.XmlTag.TagType;
-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.util.lang.Args;
@@ -143,13 +142,6 @@ public abstract class Border extends WebMarkupContainer implements IComponentRes
/** */
public static final String BORDER = "border";
- static
- {
- // register "wicket:body" and "wicket:border"
- WicketTagIdentifier.registerWellKnownTagName(BORDER);
- WicketTagIdentifier.registerWellKnownTagName(BODY);
- }
-
/** The body component associated with <wicket:body> */
private final BorderBodyContainer body;
http://git-wip-us.apache.org/repos/asf/wicket/blob/10ea373b/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 9e5006d..122374f 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,6 +22,7 @@ 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
@@ -30,6 +31,14 @@ import org.apache.wicket.markup.html.border.Border;
*/
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/10ea373b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/Panel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/Panel.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/Panel.java
index 0710574..195eaee 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/Panel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/Panel.java
@@ -57,12 +57,6 @@ public abstract class Panel extends WebMarkupContainer
/** */
public static final String PANEL = "panel";
- static
- {
- // register "wicket:panel"
- WicketTagIdentifier.registerWellKnownTagName(PANEL);
- }
-
/**
* @see org.apache.wicket.Component#Component(String)
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/10ea373b/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 50c80c7..a5a8f06 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,6 +20,7 @@ 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.
@@ -36,6 +37,13 @@ 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.
*