[wicket] branch wicket-9.x updated: WICKET-6970: do not build error message for every render for every panel

[papegaaij]

This is an automated email from the ASF dual-hosted git repository.

papegaaij pushed a commit to branch wicket-9.x
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to refs/heads/wicket-9.x by this push:
     new ec87f5f09f WICKET-6970: do not build error message for every render 
for every panel
ec87f5f09f is described below

commit ec87f5f09f5a844017e81f663c07305f924d6283
Author: Emond Papegaaij <emond.papega...@topicus.nl>
AuthorDate: Mon Apr 11 10:31:08 2022 +0200

    WICKET-6970: do not build error message for every render for every panel
---
 .../java/org/apache/wicket/MarkupContainer.java    | 25 ++++++++++++++++++----
 .../panel/AssociatedMarkupSourcingStrategy.java    |  3 +--
 2 files changed, 22 insertions(+), 6 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 5893186a4c..44d953f096 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -762,9 +762,25 @@ 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
+        *            ignored
+        * @deprecated
+        *            Use {@link #renderAssociatedMarkup(String)}. The {@code 
exceptionMessage}
+        *            parameter is ignored.
         */
+       @Deprecated(since = "9.10.0", forRemoval = true)
        public final void renderAssociatedMarkup(final String openTagName, 
final String exceptionMessage)
+       {
+               renderAssociatedMarkup(openTagName);
+       }
+       
+       /**
+        * Renders the entire associated markup for a container such as a 
Border or Panel. Any leading
+        * or trailing raw markup in the associated markup is skipped.
+        * 
+        * @param openTagName
+        *            the tag to render the associated markup for
+        */
+       public final void renderAssociatedMarkup(final String openTagName)
        {
                // Get associated markup file for the Border or Panel component
                final MarkupStream associatedMarkupStream = new 
MarkupStream(getMarkup(null));
@@ -773,15 +789,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);
        }
 
        /**