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/06/13 09:58:34 UTC
git commit: WICKET-5232 ComponentRenderer.renderComponent could
accept components with any markupId, not just "compId"
Updated Branches:
refs/heads/master 9c8f658a3 -> 0c8d63542
WICKET-5232 ComponentRenderer.renderComponent could accept components with any markupId, not just "compId"
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0c8d6354
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0c8d6354
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0c8d6354
Branch: refs/heads/master
Commit: 0c8d635423108832723c01b0d76e65ec42d333a0
Parents: 9c8f658
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Jun 13 10:58:03 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Jun 13 10:58:03 2013 +0300
----------------------------------------------------------------------
.../core/util/string/ComponentRenderer.java | 21 ++++++++++++--------
.../core/util/string/ComponentRendererTest.java | 2 +-
.../wicket/examples/asemail/MailTemplate.java | 2 +-
3 files changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/0c8d6354/wicket-core/src/main/java/org/apache/wicket/core/util/string/ComponentRenderer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/string/ComponentRenderer.java b/wicket-core/src/main/java/org/apache/wicket/core/util/string/ComponentRenderer.java
index 41704a6..5cea4b0 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/util/string/ComponentRenderer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/util/string/ComponentRenderer.java
@@ -36,11 +36,7 @@ import org.apache.wicket.util.resource.StringResourceStream;
*/
public class ComponentRenderer
{
- /**
- * The id to use when rendering a component
- */
- public static final String COMP_ID = "compId";
-
+
/**
* Collects the html generated by the rendering of a page.
*
@@ -117,13 +113,22 @@ public class ComponentRenderer
*/
private static class RenderPage extends WebPage implements IMarkupResourceStreamProvider
{
- private static final String MARKUP = "<wicket:container wicket:id='" + COMP_ID +
- "'></wicket:container>";
+ private static final String MARKUP = "<wicket:container wicket:id='%s'></wicket:container>";
@Override
public IResourceStream getMarkupResourceStream(MarkupContainer container, Class<?> containerClass)
{
- return new StringResourceStream(MARKUP);
+ String markupWithId = String.format(MARKUP, findComponentId());
+ return new StringResourceStream(markupWithId);
+ }
+
+ /**
+ * @return the component id of the single component in RenderPage
+ */
+ private String findComponentId()
+ {
+ Component component = iterator().next();
+ return component.getId();
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0c8d6354/wicket-core/src/test/java/org/apache/wicket/core/util/string/ComponentRendererTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/string/ComponentRendererTest.java b/wicket-core/src/test/java/org/apache/wicket/core/util/string/ComponentRendererTest.java
index 80922f8..edaa1d9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/util/string/ComponentRendererTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/util/string/ComponentRendererTest.java
@@ -34,6 +34,6 @@ public class ComponentRendererTest extends WicketTestCase
@Test
public void componentsAreInitialized()
{
- ComponentRenderer.renderComponent(new EnclosurePanel(ComponentRenderer.COMP_ID));
+ ComponentRenderer.renderComponent(new EnclosurePanel("anyId"));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0c8d6354/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java
index f3f1512..befc3e1 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java
@@ -108,7 +108,7 @@ public class MailTemplate extends WicketExamplePage
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form)
{
- CharSequence panelHtml = ComponentRenderer.renderComponent(new MailTemplatePanel(ComponentRenderer.COMP_ID,
+ CharSequence panelHtml = ComponentRenderer.renderComponent(new MailTemplatePanel("someId",
new PropertyModel<String>(MailTemplate.this, "name")));
updateResult(result, panelHtml, target);