You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2022/04/11 08:31:52 UTC
[wicket] branch master updated: WICKET-6970: do not build error message for every render for every panel
This is an automated email from the ASF dual-hosted git repository.
papegaaij pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/master by this push:
new 2a6ae40b02 WICKET-6970: do not build error message for every render for every panel
2a6ae40b02 is described below
commit 2a6ae40b023bc828a3c5a0d9b480040d6eab6e0e
Author: Emond Papegaaij <em...@topicus.nl>
AuthorDate: Mon Apr 11 10:31:08 2022 +0200
WICKET-6970: do not build error message for every render for every panel
---
.../src/main/java/org/apache/wicket/MarkupContainer.java | 11 +++++------
.../markup/html/panel/AssociatedMarkupSourcingStrategy.java | 3 +--
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
index 3011999a28..8703c61635 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -762,10 +762,8 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
*
* @param openTagName
* the tag to render the associated markup for
- * @param exceptionMessage
- * message that will be used for exceptions
*/
- public final void renderAssociatedMarkup(final String openTagName, final String exceptionMessage)
+ public final void renderAssociatedMarkup(final String openTagName)
{
// Get associated markup file for the Border or Panel component
final MarkupStream associatedMarkupStream = new MarkupStream(getMarkup(null));
@@ -774,15 +772,16 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
MarkupElement elem = associatedMarkupStream.get();
if ((elem instanceof ComponentTag) == false)
{
- associatedMarkupStream.throwMarkupException("Expected the open tag. " +
- exceptionMessage);
+ associatedMarkupStream.throwMarkupException("Expected the open tag. Markup for a "
+ + openTagName + " component must begin a tag like '<wicket:" + openTagName + ">'");
}
// Check for required open tag name
ComponentTag associatedMarkupOpenTag = (ComponentTag)elem;
if (!(associatedMarkupOpenTag.isOpen() && (associatedMarkupOpenTag instanceof WicketTag)))
{
- associatedMarkupStream.throwMarkupException(exceptionMessage);
+ associatedMarkupStream.throwMarkupException("Markup for a " + openTagName
+ + " component must begin a tag like '<wicket:" + openTagName + ">'");
}
try
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AssociatedMarkupSourcingStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AssociatedMarkupSourcingStrategy.java
index 3e4daced88..58d70135d1 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AssociatedMarkupSourcingStrategy.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AssociatedMarkupSourcingStrategy.java
@@ -74,8 +74,7 @@ public abstract class AssociatedMarkupSourcingStrategy extends AbstractMarkupSou
*/
protected final void renderAssociatedMarkup(final Component component)
{
- ((MarkupContainer)component).renderAssociatedMarkup(tagName, "Markup for a " + tagName +
- " component must begin a tag like '<wicket:" + tagName + ">'");
+ ((MarkupContainer)component).renderAssociatedMarkup(tagName);
}
/**