You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2021/03/20 13:34:19 UTC
[myfaces-tobago] 02/04: chore: refactor ComponentUtils ->
RendererBase
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit a6e1d556fd0a34383778019d4d7ababd236cceeb
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Fri Mar 19 18:22:26 2021 +0100
chore: refactor ComponentUtils -> RendererBase
---
.../myfaces/tobago/internal/renderkit/renderer/BadgeRenderer.java | 3 +--
.../myfaces/tobago/internal/renderkit/renderer/HiddenRenderer.java | 3 +--
.../myfaces/tobago/internal/renderkit/renderer/OutRenderer.java | 5 ++---
.../myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java | 3 +--
.../myfaces/tobago/internal/renderkit/renderer/VerbatimRenderer.java | 3 +--
.../java/org/apache/myfaces/tobago/internal/util/RenderUtils.java | 5 +++++
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BadgeRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BadgeRenderer.java
index 7cee268..20156c2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BadgeRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BadgeRenderer.java
@@ -21,7 +21,6 @@ package org.apache.myfaces.tobago.internal.renderkit.renderer;
import org.apache.myfaces.tobago.context.Markup;
import org.apache.myfaces.tobago.internal.component.AbstractUIBadge;
-import org.apache.myfaces.tobago.internal.util.RenderUtils;
import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
@@ -39,7 +38,7 @@ public class BadgeRenderer<T extends AbstractUIBadge> extends RendererBase<T> {
final TobagoResponseWriter writer = getResponseWriter(facesContext);
final Markup markup = component.getMarkup() != null ? component.getMarkup() : Markup.NULL;
final String tip = component.getTip();
- final String value = RenderUtils.currentValue(component);
+ final String value = getCurrentValue(facesContext, component);
writer.startElement(HtmlElements.TOBAGO_BADGE);
writer.writeIdAttribute(component.getClientId(facesContext));
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HiddenRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HiddenRenderer.java
index 3446d5b..5c38117 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HiddenRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HiddenRenderer.java
@@ -21,7 +21,6 @@ package org.apache.myfaces.tobago.internal.renderkit.renderer;
import org.apache.myfaces.tobago.internal.component.AbstractUIHidden;
import org.apache.myfaces.tobago.internal.util.HtmlRendererUtils;
-import org.apache.myfaces.tobago.internal.util.RenderUtils;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
@@ -41,7 +40,7 @@ public class HiddenRenderer<T extends AbstractUIHidden> extends DecodingInputRen
public void encodeBeginInternal(final FacesContext facesContext, final T component) throws IOException {
final String clientId = component.getClientId(facesContext);
- final String value = RenderUtils.currentValue(component);
+ final String value = getCurrentValue(facesContext, component);
final TobagoResponseWriter writer = getResponseWriter(facesContext);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java
index 7f5b010..57d9405 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java
@@ -23,7 +23,6 @@ import org.apache.myfaces.tobago.config.TobagoConfig;
import org.apache.myfaces.tobago.context.Markup;
import org.apache.myfaces.tobago.internal.component.AbstractUIOut;
import org.apache.myfaces.tobago.internal.util.HtmlRendererUtils;
-import org.apache.myfaces.tobago.internal.util.RenderUtils;
import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
import org.apache.myfaces.tobago.renderkit.css.CssItem;
import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
@@ -95,12 +94,12 @@ public class OutRenderer<T extends AbstractUIOut> extends MessageLayoutRendererB
encodeText(facesContext, component);
}
- private void encodeText(final FacesContext facesContext, final AbstractUIOut out) throws IOException {
+ private void encodeText(final FacesContext facesContext, final T out) throws IOException {
final TobagoResponseWriter writer = getResponseWriter(facesContext);
final boolean escape = out.isEscape();
final boolean keepLineBreaks = out.isKeepLineBreaks();
- String text = RenderUtils.currentValue(out);
+ String text = getCurrentValue(facesContext, out);
if (text == null) {
text = "";
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java
index 148f36e..5bc458e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java
@@ -24,7 +24,6 @@ import org.apache.myfaces.tobago.context.Markup;
import org.apache.myfaces.tobago.internal.component.AbstractUITextarea;
import org.apache.myfaces.tobago.internal.util.AccessKeyLogger;
import org.apache.myfaces.tobago.internal.util.HtmlRendererUtils;
-import org.apache.myfaces.tobago.internal.util.RenderUtils;
import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
@@ -136,7 +135,7 @@ public class TextareaRenderer<T extends AbstractUITextarea> extends MessageLayou
if (!disabled && !readonly && StringUtils.isNotBlank(placeholder)) {
writer.writeAttribute(HtmlAttributes.PLACEHOLDER, placeholder, true);
}
- String currentValue = RenderUtils.currentValue(component);
+ String currentValue = getCurrentValue(facesContext, component);
if (currentValue != null) {
if (ComponentUtils.getDataAttribute(component, "html-editor") != null
&& SanitizeMode.auto == component.getSanitize()) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/VerbatimRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/VerbatimRenderer.java
index 7713236..cd00327 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/VerbatimRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/VerbatimRenderer.java
@@ -21,7 +21,6 @@ package org.apache.myfaces.tobago.internal.renderkit.renderer;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.renderkit.RendererBase;
-import org.apache.myfaces.tobago.internal.util.RenderUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -36,7 +35,7 @@ public class VerbatimRenderer<T extends UIComponent> extends RendererBase<T> {
final TobagoResponseWriter writer = getResponseWriter(facesContext);
- final String value = RenderUtils.currentValue(component);
+ final String value = getCurrentValue(facesContext, component);
if (value == null) {
return;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/RenderUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/RenderUtils.java
index e22c994..221b83b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/RenderUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/RenderUtils.java
@@ -32,6 +32,7 @@ import org.apache.myfaces.tobago.internal.renderkit.renderer.TobagoClientBehavio
import org.apache.myfaces.tobago.model.ExpandedState;
import org.apache.myfaces.tobago.model.SelectedState;
import org.apache.myfaces.tobago.model.TreePath;
+import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -136,6 +137,10 @@ public final class RenderUtils {
return false;
}
+ /**
+ * @deprecated since 5.0.0. Please use {@link RendererBase#getCurrentValue}
+ */
+ @Deprecated
public static String currentValue(final UIComponent component) {
String currentValue = null;
if (component instanceof ValueHolder) {