[wicket] branch csp updated: WICKET-6727: configurable css classnames, fixup

[papegaaij]

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

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


The following commit(s) were added to refs/heads/csp by this push:
     new a220f7b  WICKET-6727: configurable css classnames, fixup
a220f7b is described below

commit a220f7bcce00a95fc817cf7b6514a0ca112cfdd9
Author: Emond Papegaaij <emond.papega...@topicus.nl>
AuthorDate: Fri Jan 24 09:03:46 2020 +0100

    WICKET-6727: configurable css classnames, fixup
---
 wicket-core/src/main/java/org/apache/wicket/Component.java          | 6 +++---
 .../src/main/java/org/apache/wicket/markup/html/form/Form.java      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java 
b/wicket-core/src/main/java/org/apache/wicket/Component.java
index 6f00579..f3b31f7 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -2364,9 +2364,9 @@ public abstract class Component
        {
                String name = Strings.isEmpty(tag.getNamespace()) ? 
tag.getName()
                        : tag.getNamespace() + ':' + tag.getName();
-               response
-                       .write(String.format("<%s id=\"%s\" class=\"%s\" 
data-wicket-placeholder=\"\"></%s>",
-                               name, getAjaxRegionMarkupId(), 
CssUtils.key(Component.class, "hidden"), name));
+               response.write(
+                       String.format("<%s id=\"%s\" class=\"%s\" 
data-wicket-placeholder=\"\"></%s>", name,
+                               getAjaxRegionMarkupId(), 
getString(CssUtils.key(Component.class, "hidden")), name));
        }
 
 
diff --git 
a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java 
b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
index f03ff35..a39160a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
@@ -1242,8 +1242,8 @@ public class Form<T> extends WebMarkupContainer
                AppendingStringBuffer buffer = new AppendingStringBuffer();
 
                // div that is not visible (but not display:none either)
-               buffer
-                       .append(String.format("<div class=\"%s\">", 
CssUtils.key(Form.class, "hidden-fields")));
+               buffer.append(String.format("<div class=\"%s\">",
+                       getString(CssUtils.key(Form.class, "hidden-fields"))));
 
                // add an empty textfield (otherwise IE doesn't work)
                buffer.append("<input type=\"text\" tabindex=\"-1\" 
autocomplete=\"off\"/>");
@@ -1763,7 +1763,7 @@ public class Form<T> extends WebMarkupContainer
                {
                        getResponse().write(String.format("<div id=\"%s\" 
class=\"%s\">",
                                getHiddenFieldsId(HIDDEN_FIELDS_PARAMS_IDX),
-                               CssUtils.key(Form.class, "hidden-fields")));
+                               getString(CssUtils.key(Form.class, 
"hidden-fields"))));
 
                        AppendingStringBuffer buffer = new 
AppendingStringBuffer();