WICKET-4391 XsltOutputTransformerContainer not necessarily has xsl markup type
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5d64196a Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5d64196a Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5d64196a Branch: refs/heads/master Commit: 5d64196a178cbc3a2f1bd2cd96c7a36be763f3d2 Parents: b56e9d5 Author: svenmeier <[email protected]> Authored: Tue Feb 7 12:58:38 2012 +0100 Committer: svenmeier <[email protected]> Committed: Tue Feb 7 12:58:38 2012 +0100 ---------------------------------------------------------------------- .../XsltOutputTransformerContainer.java | 12 +--------- .../wicket/markup/outputTransformer/Page_1.java | 16 ++++++-------- 2 files changed, 9 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/5d64196a/wicket-core/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java b/wicket-core/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java index d09c100..4d1724b 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java @@ -19,7 +19,6 @@ package org.apache.wicket.markup.transformer; import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; import org.apache.wicket.markup.MarkupResourceStream; -import org.apache.wicket.markup.MarkupType; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; @@ -29,9 +28,8 @@ import org.apache.wicket.model.Model; * with an associated markup and must have a filename equal to the component's id. * <p> * The containers tag will be the root element of the xml data applied for transformation to ensure - * the xml data are well formed (single root element). In addition the attribute - * <code>xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.3-strict.dtd</code> is added - * to the root element to allow the XSL processor to handle the wicket namespace. + * the xml data are well formed (single root element). In addition the attribute <code>xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.3-strict.dtd</code> + * is added to the root element to allow the XSL processor to handle the wicket namespace. * <p> * Similar to this container, a <code>IBehavior</code> is available which does the same, but does * not require an additional Container. @@ -105,12 +103,6 @@ public class XsltOutputTransformerContainer extends AbstractOutputTransformerCon } @Override - public MarkupType getMarkupType() - { - return new MarkupType("xsl", null); - } - - @Override public CharSequence transform(final Component component, final CharSequence output) throws Exception { http://git-wip-us.apache.org/repos/asf/wicket/blob/5d64196a/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java b/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java index 6921520..8316b2c 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java @@ -67,6 +67,13 @@ public class Page_1 extends WebPage panel.setRenderBodyOnly(true); panelContainer.add(panel); + MarkupContainer xsltContainer = new XsltOutputTransformerContainer("test4"); + add(xsltContainer); + Border border2 = new SimpleBorder("myBorder2"); + border2.setRenderBodyOnly(false); + border2.add(new AttributeModifier("testAttr", "myValue")); + xsltContainer.add(border2); + MarkupContainer borderContainer = new AbstractOutputTransformerContainer("test3") { private static final long serialVersionUID = 1L; @@ -83,18 +90,9 @@ public class Page_1 extends WebPage Border border = new SimpleBorder("myBorder"); borderContainer.add(border); - MarkupContainer xsltContainer = new XsltOutputTransformerContainer("test4"); - add(xsltContainer); - - Border border2 = new SimpleBorder("myBorder2"); - border2.setRenderBodyOnly(false); - border2.add(new AttributeModifier("testAttr", "myValue")); - xsltContainer.add(border2); - MarkupContainer xsltContainer2 = new XsltOutputTransformerContainer("test5", null, "org/apache/wicket/markup/outputTransformer/anyName.xsl"); add(xsltContainer2); - Border border3 = new SimpleBorder("myBorder3"); border3.setRenderBodyOnly(false); border3.add(new AttributeModifier("testAttr", "myValue"));
