You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2020/06/08 11:27:04 UTC
[myfaces] branch master updated: MYFACES-4338
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/master by this push:
new 267a164 MYFACES-4338
267a164 is described below
commit 267a164818ad1b831db1c6452510bdc9841d2c31
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Mon Jun 8 13:26:53 2020 +0200
MYFACES-4338
---
.../renderkit/html/base/HtmlTextRendererBase.java | 54 +----
.../renderkit/html/util/CommonPropertyUtils.java | 235 +++++++++++++++++----
2 files changed, 199 insertions(+), 90 deletions(-)
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlTextRendererBase.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlTextRendererBase.java
index c325f2d..7413dfa 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlTextRendererBase.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlTextRendererBase.java
@@ -32,7 +32,6 @@ import java.util.logging.Logger;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
import javax.faces.component.UIOutput;
-import javax.faces.component.UIViewRoot;
import javax.faces.component.behavior.ClientBehavior;
import javax.faces.component.behavior.ClientBehaviorHolder;
import javax.faces.component.html.HtmlInputText;
@@ -84,21 +83,22 @@ public class HtmlTextRendererBase
protected void renderOutput(FacesContext facesContext, UIComponent component) throws IOException
{
-
String text = RendererUtils.getStringValue(facesContext, component);
if (log.isLoggable(Level.FINE))
{
log.fine("renderOutput '" + text + '\'');
}
+
boolean escape;
if (component instanceof HtmlOutputText)
{
- escape = ((HtmlOutputText)component).isEscape();
+ escape = ((HtmlOutputText) component).isEscape();
}
else
{
escape = RendererUtils.getBooleanAttribute(component, JSFAttr.ESCAPE_ATTR, true); //default is to escape
}
+
if (text != null)
{
ResponseWriter writer = facesContext.getResponseWriter();
@@ -107,7 +107,7 @@ public class HtmlTextRendererBase
if (isCommonPropertiesOptimizationEnabled(facesContext))
{
long commonPropertiesMarked = CommonPropertyUtils.getCommonPropertiesMarked(component);
- if ( (commonPropertiesMarked & ~(CommonPropertyConstants.ESCAPE_PROP)) > 0)
+ if (commonPropertiesMarked > 0 && (commonPropertiesMarked & ~(CommonPropertyConstants.ESCAPE_PROP)) > 0)
{
span = true;
writer.startElement(HTML.SPAN_ELEM, component);
@@ -385,50 +385,4 @@ public class HtmlTextRendererBase
//subclasses may act on properties of the component
return HTML.INPUT_TYPE_TEXT;
}
-
- public static void renderOutputText(FacesContext facesContext,
- UIComponent component, String text, boolean escape)
- throws IOException
- {
- if (text != null)
- {
- ResponseWriter writer = facesContext.getResponseWriter();
- boolean span = false;
-
- if (component.getId() != null
- && !component.getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX))
- {
- span = true;
-
- writer.startElement(HTML.SPAN_ELEM, component);
-
- HtmlRendererUtils.writeIdIfNecessary(writer, component, facesContext);
-
- HtmlRendererUtils.renderHTMLAttributes(writer, component, HTML.COMMON_PASSTROUGH_ATTRIBUTES);
- }
- else
- {
- span = HtmlRendererUtils.renderHTMLAttributesWithOptionalStartElement(writer,
- component, HTML.SPAN_ELEM, HTML.COMMON_PASSTROUGH_ATTRIBUTES);
- }
-
- if (escape)
- {
- if (log.isLoggable(Level.FINE))
- {
- log.fine("renderOutputText writing '" + text + '\'');
- }
- writer.writeText(text, JSFAttr.VALUE_ATTR);
- }
- else
- {
- writer.write(text);
- }
-
- if (span)
- {
- writer.endElement(HTML.SPAN_ELEM);
- }
- }
- }
}
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/CommonPropertyUtils.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/CommonPropertyUtils.java
index c61c1f6..1fd8d6b 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/CommonPropertyUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/CommonPropertyUtils.java
@@ -48,6 +48,11 @@ public final class CommonPropertyUtils
long commonPropertiesMarked, UIComponent component)
throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
if ((commonPropertiesMarked & CommonPropertyConstants.DIR_PROP) != 0)
{
HtmlRendererUtils.renderHTMLStringAttribute(writer, component,
@@ -74,6 +79,11 @@ public final class CommonPropertyUtils
long commonPropertiesMarked, UIComponent component)
throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
if ((commonPropertiesMarked & CommonPropertyConstants.DIR_PROP) != 0)
{
HtmlRendererUtils.renderHTMLStringAttribute(writer, component,
@@ -95,6 +105,11 @@ public final class CommonPropertyUtils
long commonPropertiesMarked, UIComponent component)
throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
if ((commonPropertiesMarked & CommonPropertyConstants.STYLE_PROP) != 0)
{
HtmlRendererUtils.renderHTMLStringAttribute(writer, component,
@@ -111,6 +126,11 @@ public final class CommonPropertyUtils
long commonPropertiesMarked, UIComponent component)
throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
if ((commonPropertiesMarked & CommonPropertyConstants.STYLECLASS_PROP) != 0)
{
HtmlRendererUtils.renderHTMLStringAttribute(writer, component,
@@ -122,6 +142,11 @@ public final class CommonPropertyUtils
long commonPropertiesMarked, UIComponent component)
throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
if ((commonPropertiesMarked & CommonPropertyConstants.ONCLICK_PROP) != 0)
{
HtmlRendererUtils.renderHTMLStringAttribute(writer, component,
@@ -134,6 +159,11 @@ public final class CommonPropertyUtils
long commonPropertiesMarked, UIComponent component)
throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
if ((commonPropertiesMarked & CommonPropertyConstants.ONDBLCLICK_PROP) != 0)
{
HtmlRendererUtils.renderHTMLStringAttribute(writer, component,
@@ -186,6 +216,11 @@ public final class CommonPropertyUtils
long commonPropertiesMarked, UIComponent component)
throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
if ((commonPropertiesMarked & CommonPropertyConstants.ONCHANGE_PROP) != 0)
{
HtmlRendererUtils.renderHTMLStringAttribute(writer, component,
@@ -202,6 +237,11 @@ public final class CommonPropertyUtils
long commonPropertiesMarked, UIComponent component)
throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
if ((commonPropertiesMarked & CommonPropertyConstants.ONFOCUS_PROP) != 0)
{
HtmlRendererUtils.renderHTMLStringAttribute(writer, component,
@@ -217,6 +257,11 @@ public final class CommonPropertyUtils
public static void renderFieldEventPropertiesWithoutOnchangeAndOnselect(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component) throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
if ((commonPropertiesMarked & CommonPropertyConstants.ONFOCUS_PROP) != 0)
{
HtmlRendererUtils.renderHTMLStringAttribute(writer, component,
@@ -232,6 +277,11 @@ public final class CommonPropertyUtils
public static void renderFieldEventPropertiesWithoutOnchange(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component) throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
if ((commonPropertiesMarked & CommonPropertyConstants.ONFOCUS_PROP) != 0)
{
HtmlRendererUtils.renderHTMLStringAttribute(writer, component,
@@ -252,6 +302,11 @@ public final class CommonPropertyUtils
public static void renderChangeEventProperty(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component) throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
if ((commonPropertiesMarked & CommonPropertyConstants.ONCHANGE_PROP) != 0)
{
HtmlRendererUtils.renderHTMLStringAttribute(writer, component,
@@ -263,6 +318,11 @@ public final class CommonPropertyUtils
long commonPropertiesMarked, UIComponent component)
throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
if ((commonPropertiesMarked & CommonPropertyConstants.ACCESSKEY_PROP) != 0)
{
HtmlRendererUtils.renderHTMLStringAttribute(writer, component,
@@ -279,6 +339,11 @@ public final class CommonPropertyUtils
long commonPropertiesMarked, UIComponent component)
throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
if ((commonPropertiesMarked & CommonPropertyConstants.ALIGN_PROP) != 0)
{
HtmlRendererUtils.renderHTMLStringAttribute(writer, component,
@@ -292,9 +357,13 @@ public final class CommonPropertyUtils
}
public static void renderInputProperties(ResponseWriter writer,
- long commonPropertiesMarked, UIComponent component)
- throws IOException
+ long commonPropertiesMarked, UIComponent component) throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
if ((commonPropertiesMarked & CommonPropertyConstants.ALIGN_PROP) != 0)
{
HtmlRendererUtils.renderHTMLAttribute(writer, component,
@@ -328,9 +397,13 @@ public final class CommonPropertyUtils
}
public static void renderAnchorProperties(ResponseWriter writer,
- long commonPropertiesMarked, UIComponent component)
- throws IOException
+ long commonPropertiesMarked, UIComponent component) throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
renderAccesskeyTabindexProperties(writer, commonPropertiesMarked, component);
if ((commonPropertiesMarked & CommonPropertyConstants.CHARSET_PROP) != 0)
{
@@ -375,17 +448,25 @@ public final class CommonPropertyUtils
}
public static void renderCommonPassthroughPropertiesWithoutEvents(ResponseWriter writer,
- long commonPropertiesMarked, UIComponent component)
- throws IOException
+ long commonPropertiesMarked, UIComponent component) throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
renderStyleProperties(writer, commonPropertiesMarked, component);
renderUniversalProperties(writer, commonPropertiesMarked, component);
}
public static void renderCommonPassthroughProperties(ResponseWriter writer,
- long commonPropertiesMarked, UIComponent component)
- throws IOException
+ long commonPropertiesMarked, UIComponent component) throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
renderStyleProperties(writer, commonPropertiesMarked, component);
renderUniversalProperties(writer, commonPropertiesMarked, component);
renderEventProperties(writer, commonPropertiesMarked, component);
@@ -393,94 +474,138 @@ public final class CommonPropertyUtils
//Methods
public static void renderCommonFieldEventProperties(ResponseWriter writer,
- long commonPropertiesMarked, UIComponent component)
- throws IOException
+ long commonPropertiesMarked, UIComponent component) throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
renderChangeSelectEventProperties(writer, commonPropertiesMarked, component);
renderFocusBlurEventProperties(writer, commonPropertiesMarked, component);
}
public static void renderCommonFieldPassthroughPropertiesWithoutDisabled(ResponseWriter writer,
- long commonPropertiesMarked, UIComponent component)
- throws IOException
+ long commonPropertiesMarked, UIComponent component) throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
renderCommonPassthroughProperties(writer, commonPropertiesMarked, component);
renderAccesskeyTabindexProperties(writer, commonPropertiesMarked, component);
renderCommonFieldEventProperties(writer, commonPropertiesMarked, component);
}
public static void renderCommonFieldPassthroughPropertiesWithoutDisabledAndEvents(ResponseWriter writer,
- long commonPropertiesMarked, UIComponent component)
- throws IOException
+ long commonPropertiesMarked, UIComponent component) throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
renderCommonPassthroughPropertiesWithoutEvents(writer, commonPropertiesMarked, component);
renderAccesskeyTabindexProperties(writer, commonPropertiesMarked, component);
}
public static void renderInputPassthroughPropertiesWithoutDisabled(ResponseWriter writer,
- long commonPropertiesMarked, UIComponent component)
- throws IOException
+ long commonPropertiesMarked, UIComponent component) throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
renderInputProperties(writer, commonPropertiesMarked, component);
renderCommonFieldPassthroughPropertiesWithoutDisabled(writer, commonPropertiesMarked, component);
}
public static void renderInputPassthroughPropertiesWithoutDisabledAndEvents(ResponseWriter writer,
- long commonPropertiesMarked, UIComponent component)
- throws IOException
+ long commonPropertiesMarked, UIComponent component) throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
renderInputProperties(writer, commonPropertiesMarked, component);
renderCommonFieldPassthroughPropertiesWithoutDisabledAndEvents(writer, commonPropertiesMarked, component);
}
public static void renderAnchorPassthroughProperties(ResponseWriter writer,
- long commonPropertiesMarked, UIComponent component)
- throws IOException
+ long commonPropertiesMarked, UIComponent component) throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
renderAnchorProperties(writer, commonPropertiesMarked, component);
renderCommonPassthroughProperties(writer, commonPropertiesMarked, component);
renderFocusBlurEventProperties(writer, commonPropertiesMarked, component);
}
public static void renderAnchorPassthroughPropertiesDisabled(ResponseWriter writer,
- long commonPropertiesMarked, UIComponent component)
- throws IOException
+ long commonPropertiesMarked, UIComponent component) throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
renderAccesskeyTabindexProperties(writer, commonPropertiesMarked, component);
renderCommonPassthroughProperties(writer, commonPropertiesMarked, component);
renderFocusBlurEventProperties(writer, commonPropertiesMarked, component);
}
public static void renderAnchorPassthroughPropertiesWithoutEvents(ResponseWriter writer,
- long commonPropertiesMarked, UIComponent component)
- throws IOException
+ long commonPropertiesMarked, UIComponent component) throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
renderAnchorProperties(writer, commonPropertiesMarked, component);
renderStyleProperties(writer, commonPropertiesMarked, component);
renderUniversalProperties(writer, commonPropertiesMarked, component);
}
public static void renderAnchorPassthroughPropertiesDisabledWithoutEvents(ResponseWriter writer,
- long commonPropertiesMarked, UIComponent component)
- throws IOException
+ long commonPropertiesMarked, UIComponent component) throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
renderAccesskeyTabindexProperties(writer, commonPropertiesMarked, component);
renderStyleProperties(writer, commonPropertiesMarked, component);
renderUniversalProperties(writer, commonPropertiesMarked, component);
}
public static void renderAnchorPassthroughPropertiesWithoutStyleAndEvents(ResponseWriter writer,
- long commonPropertiesMarked, UIComponent component)
- throws IOException
+ long commonPropertiesMarked, UIComponent component) throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
renderAnchorProperties(writer, commonPropertiesMarked, component);
renderUniversalProperties(writer, commonPropertiesMarked, component);
}
public static void renderAnchorPassthroughPropertiesWithoutStyle(ResponseWriter writer,
- long commonPropertiesMarked, UIComponent component)
- throws IOException
+ long commonPropertiesMarked, UIComponent component) throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
renderAnchorProperties(writer, commonPropertiesMarked, component);
renderUniversalProperties(writer, commonPropertiesMarked, component);
renderEventProperties(writer, commonPropertiesMarked, component);
@@ -488,9 +613,13 @@ public final class CommonPropertyUtils
}
public static void renderAnchorPassthroughPropertiesWithoutOnclickAndStyle(ResponseWriter writer,
- long commonPropertiesMarked, UIComponent component)
- throws IOException
+ long commonPropertiesMarked, UIComponent component) throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
renderAnchorProperties(writer, commonPropertiesMarked, component);
renderUniversalProperties(writer, commonPropertiesMarked, component);
renderEventPropertiesWithoutOnclick(writer, commonPropertiesMarked, component);
@@ -498,9 +627,13 @@ public final class CommonPropertyUtils
}
public static void renderButtonPassthroughPropertiesWithoutDisabledAndEvents(ResponseWriter writer,
- long commonPropertiesMarked, UIComponent component)
- throws IOException
+ long commonPropertiesMarked, UIComponent component) throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
renderUniversalProperties(writer, commonPropertiesMarked, component);
renderStyleProperties(writer, commonPropertiesMarked, component);
renderAccesskeyTabindexProperties(writer, commonPropertiesMarked, component);
@@ -508,9 +641,13 @@ public final class CommonPropertyUtils
}
public static void renderLabelProperties(ResponseWriter writer,
- long commonPropertiesMarked, UIComponent component)
- throws IOException
+ long commonPropertiesMarked, UIComponent component) throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
renderFocusBlurEventProperties(writer, commonPropertiesMarked, component);
if ((commonPropertiesMarked & CommonPropertyConstants.ACCESSKEY_PROP) != 0)
{
@@ -521,17 +658,25 @@ public final class CommonPropertyUtils
public static void renderLabelPassthroughProperties(ResponseWriter writer,
- long commonPropertiesMarked, UIComponent component)
- throws IOException
+ long commonPropertiesMarked, UIComponent component) throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
renderLabelProperties(writer, commonPropertiesMarked, component);
renderCommonPassthroughProperties(writer, commonPropertiesMarked, component);
}
public static void renderLabelPassthroughPropertiesWithoutEvents(ResponseWriter writer,
- long commonPropertiesMarked, UIComponent component)
- throws IOException
+ long commonPropertiesMarked, UIComponent component) throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
if ((commonPropertiesMarked & CommonPropertyConstants.ACCESSKEY_PROP) != 0)
{
HtmlRendererUtils.renderHTMLStringAttribute(writer, component,
@@ -544,6 +689,11 @@ public final class CommonPropertyUtils
long commonPropertiesMarked, UIComponent component)
throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
renderCommonFieldPassthroughPropertiesWithoutDisabled(writer, commonPropertiesMarked, component);
}
@@ -551,6 +701,11 @@ public final class CommonPropertyUtils
long commonPropertiesMarked, UIComponent component)
throws IOException
{
+ if (commonPropertiesMarked == 0)
+ {
+ return;
+ }
+
renderCommonFieldPassthroughPropertiesWithoutDisabledAndEvents(writer, commonPropertiesMarked, component);
}
}