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 2017/08/17 12:54:56 UTC
svn commit: r1805280 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/
tobago-extension/tobago-sandbox/src/main/java/org/apach...
Author: lofwyr
Date: Thu Aug 17 12:54:55 2017
New Revision: 1805280
URL: http://svn.apache.org/viewvc?rev=1805280&view=rev
Log:
TOBAGO-1782: Clean up utility classes
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BoxRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FigureRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FlowLayoutRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/GridLayoutRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SegmentLayoutRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectReferenceRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ArrayUtils.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/RenderUtils.java
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SplitLayoutRenderer.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java?rev=1805280&r1=1805279&r2=1805280&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java Thu Aug 17 12:54:55 2017
@@ -26,7 +26,6 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.component.AbstractUILinks;
import org.apache.myfaces.tobago.internal.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.internal.util.JQueryUtils;
-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.Icons;
@@ -83,9 +82,7 @@ public class BarRenderer extends Rendere
public void encodeChildren(FacesContext facesContext, UIComponent component) throws IOException {
setRenderTypes(component);
for (UIComponent child : component.getChildren()) {
- if (child.isRendered()) {
- child.encodeAll(facesContext);
- }
+ child.encodeAll(facesContext);
}
}
@@ -112,7 +109,7 @@ public class BarRenderer extends Rendere
writer.writeClassAttribute(BootstrapClass.MY_LG_0, BootstrapClass.ML_AUTO);
setRenderTypes(after);
- RenderUtils.encode(facesContext, after);
+ after.encodeAll(facesContext);
writer.endElement(HtmlElements.DIV);
}
@@ -144,7 +141,7 @@ public class BarRenderer extends Rendere
if (brand != null) {
writer.startElement(HtmlElements.SPAN);
writer.writeClassAttribute(BootstrapClass.NAVBAR_BRAND);
- RenderUtils.encode(facesContext, brand);
+ brand.encodeAll(facesContext);
writer.endElement(HtmlElements.SPAN);
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BoxRenderer.java?rev=1805280&r1=1805279&r2=1805280&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BoxRenderer.java Thu Aug 17 12:54:55 2017
@@ -21,7 +21,6 @@ package org.apache.myfaces.tobago.intern
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.internal.component.AbstractUIBox;
import org.apache.myfaces.tobago.internal.util.HtmlRendererUtils;
-import org.apache.myfaces.tobago.internal.util.RenderUtils;
import org.apache.myfaces.tobago.model.CollapseMode;
import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
@@ -78,11 +77,11 @@ public class BoxRenderer extends PanelRe
writer.writeText(labelString);
}
if (label != null) {
- RenderUtils.encode(facesContext, label);
+ label.encodeAll(facesContext);
}
writer.endElement(HtmlElements.H3);
if (bar != null) {
- RenderUtils.encode(facesContext, bar);
+ bar.encodeAll(facesContext);
}
writer.endElement(HtmlElements.DIV);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FigureRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FigureRenderer.java?rev=1805280&r1=1805279&r2=1805280&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FigureRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FigureRenderer.java Thu Aug 17 12:54:55 2017
@@ -21,7 +21,6 @@ package org.apache.myfaces.tobago.intern
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.internal.component.AbstractUIFigure;
-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;
@@ -75,7 +74,7 @@ public class FigureRenderer extends Rend
writer.writeText(labelString);
}
if (label != null) {
- RenderUtils.encode(facesContext, label);
+ label.encodeAll(facesContext);
}
writer.endElement(HtmlElements.FIGCAPTION);
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FlowLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FlowLayoutRenderer.java?rev=1805280&r1=1805279&r2=1805280&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FlowLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FlowLayoutRenderer.java Thu Aug 17 12:54:55 2017
@@ -20,7 +20,6 @@
package org.apache.myfaces.tobago.internal.renderkit.renderer;
import org.apache.myfaces.tobago.component.UIFlowLayout;
-import org.apache.myfaces.tobago.internal.util.RenderUtils;
import org.apache.myfaces.tobago.layout.TextAlign;
import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.apache.myfaces.tobago.renderkit.css.Style;
@@ -57,15 +56,6 @@ public class FlowLayoutRenderer extends
}
@Override
- public void encodeChildren(final FacesContext facesContext, final UIComponent component) throws IOException {
- final UIComponent container = component.getParent();
- if (!container.isRendered()) {
- return;
- }
- RenderUtils.encodeChildren(facesContext, container);
- }
-
- @Override
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.DIV);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/GridLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/GridLayoutRenderer.java?rev=1805280&r1=1805279&r2=1805280&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/GridLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/GridLayoutRenderer.java Thu Aug 17 12:54:55 2017
@@ -25,7 +25,6 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.layout.Grid;
import org.apache.myfaces.tobago.internal.layout.OriginCell;
import org.apache.myfaces.tobago.internal.util.JsonUtils;
-import org.apache.myfaces.tobago.internal.util.RenderUtils;
import org.apache.myfaces.tobago.layout.LayoutToken;
import org.apache.myfaces.tobago.layout.LayoutTokens;
import org.apache.myfaces.tobago.layout.Measure;
@@ -137,7 +136,7 @@ public class GridLayoutRenderer extends
if (builder.length() > 2) { // empty is not need to render
ComponentUtils.putDataAttribute(element, "tobago-layout", builder.toString());
}
- RenderUtils.encode(facesContext, element);
+ element.encodeAll(facesContext);
writer.endElement(HtmlElements.TD);
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java?rev=1805280&r1=1805279&r2=1805280&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java Thu Aug 17 12:54:55 2017
@@ -176,7 +176,7 @@ public class InRenderer extends MessageL
} else {
child.setRendererType(RendererTypes.ButtonInsideIn.name());
}
- RenderUtils.encode(facesContext, child);
+ child.encodeAll(facesContext);
} else {
writer.startElement(HtmlElements.SPAN);
@@ -191,7 +191,7 @@ public class InRenderer extends MessageL
}
writer.writeClassAttribute(cssItem);
- RenderUtils.encode(facesContext, child);
+ child.encodeAll(facesContext);
writer.endElement(HtmlElements.SPAN);
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java?rev=1805280&r1=1805279&r2=1805280&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java Thu Aug 17 12:54:55 2017
@@ -318,7 +318,7 @@ public class PageRenderer extends Render
if (component.getFacet("backButtonDetector") != null) {
final UIComponent hidden = component.getFacet("backButtonDetector");
- RenderUtils.encode(facesContext, hidden);
+ hidden.encodeAll(facesContext);
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java?rev=1805280&r1=1805279&r2=1805280&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java Thu Aug 17 12:54:55 2017
@@ -22,7 +22,6 @@ package org.apache.myfaces.tobago.intern
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.internal.component.AbstractUISection;
import org.apache.myfaces.tobago.internal.util.HtmlRendererUtils;
-import org.apache.myfaces.tobago.internal.util.RenderUtils;
import org.apache.myfaces.tobago.model.CollapseMode;
import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
@@ -89,7 +88,7 @@ public class SectionRenderer extends Pan
final UIComponent bar = ComponentUtils.getFacet(section, Facets.bar);
if (bar != null) {
- RenderUtils.encode(facesContext, bar);
+ bar.encodeAll(facesContext);
}
writer.endElement(HtmlElements.DIV);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SegmentLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SegmentLayoutRenderer.java?rev=1805280&r1=1805279&r2=1805280&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SegmentLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SegmentLayoutRenderer.java Thu Aug 17 12:54:55 2017
@@ -23,7 +23,6 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.component.SupportsLabelLayout;
import org.apache.myfaces.tobago.component.UISegmentLayout;
import org.apache.myfaces.tobago.internal.component.AbstractUISegmentLayout;
-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;
@@ -116,7 +115,7 @@ public class SegmentLayoutRenderer exten
throws IOException {
writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(null, null, generator.generate(child));
- RenderUtils.encode(facesContext, child);
+ child.encodeAll(facesContext);
writer.endElement(HtmlElements.DIV);
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRenderer.java?rev=1805280&r1=1805279&r2=1805280&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRenderer.java Thu Aug 17 12:54:55 2017
@@ -20,6 +20,7 @@
package org.apache.myfaces.tobago.internal.renderkit.renderer;
import org.apache.myfaces.tobago.internal.component.AbstractUISelectManyCheckbox;
+import org.apache.myfaces.tobago.internal.util.ArrayUtils;
import org.apache.myfaces.tobago.internal.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.internal.util.JsonUtils;
import org.apache.myfaces.tobago.internal.util.RenderUtils;
@@ -92,9 +93,9 @@ public class SelectManyCheckboxRenderer
final String formattedValue = ComponentUtils.getFormattedValue(facesContext, select, item.getValue());
boolean checked;
if (submittedValues == null) {
- checked = RenderUtils.contains(values, item.getValue());
+ checked = ArrayUtils.contains(values, item.getValue());
} else {
- checked = RenderUtils.contains(submittedValues, formattedValue);
+ checked = ArrayUtils.contains(submittedValues, formattedValue);
}
writer.writeAttribute(HtmlAttributes.CHECKED, checked);
writer.writeNameAttribute(id);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectReferenceRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectReferenceRenderer.java?rev=1805280&r1=1805279&r2=1805280&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectReferenceRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectReferenceRenderer.java Thu Aug 17 12:54:55 2017
@@ -21,7 +21,6 @@ package org.apache.myfaces.tobago.intern
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.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +43,7 @@ public class SelectReferenceRenderer ext
final Object renderRange = ComponentUtils.getAttribute(component, Attributes.renderRange);
ComponentUtils.setAttribute(reference, Attributes.renderRangeExtern, renderRange);
- RenderUtils.encode(facesContext, reference);
+ reference.encodeAll(facesContext);
ComponentUtils.removeAttribute(reference, Attributes.renderRangeExtern);
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java?rev=1805280&r1=1805279&r2=1805280&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java Thu Aug 17 12:54:55 2017
@@ -643,11 +643,11 @@ public class SheetRenderer extends Rende
TobagoClass.SHEET__COLUMN_SELECTOR);
writer.endElement(HtmlElements.INPUT);
} else if (normalColumn instanceof AbstractUIColumnNode) {
- RenderUtils.encode(facesContext, normalColumn);
+ normalColumn.encodeAll(facesContext);
} else {
final List<UIComponent> children = sheet.getRenderedChildrenOf(normalColumn);
for (final UIComponent grandKid : children) {
- RenderUtils.encode(facesContext, grandKid);
+ grandKid.encodeAll(facesContext);
}
}
@@ -879,7 +879,7 @@ public class SheetRenderer extends Rende
true);
writer.endElement(HtmlElements.INPUT);
} else {
- RenderUtils.encode(facesContext, cellComponent);
+ cellComponent.encodeAll(facesContext);
}
if (sorterIcon != null) {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java?rev=1805280&r1=1805279&r2=1805280&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java Thu Aug 17 12:54:55 2017
@@ -296,7 +296,7 @@ public class TabGroupRenderer extends Re
final UIComponent bar = ComponentUtils.getFacet(tab, Facets.bar);
if (bar != null) {
- RenderUtils.encode(facesContext, bar);
+ bar.encodeAll(facesContext);
}
writer.endElement(HtmlElements.LI);
@@ -331,7 +331,7 @@ public class TabGroupRenderer extends Re
writer.writeAttribute(HtmlAttributes.TABGROUPINDEX, index);
- RenderUtils.encode(facesContext, tab);
+ tab.encodeAll(facesContext);
writer.endElement(HtmlElements.DIV);
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRenderer.java?rev=1805280&r1=1805279&r2=1805280&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRenderer.java Thu Aug 17 12:54:55 2017
@@ -26,7 +26,6 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.internal.component.AbstractUITree;
import org.apache.myfaces.tobago.internal.component.AbstractUITreeListbox;
import org.apache.myfaces.tobago.internal.util.HtmlRendererUtils;
-import org.apache.myfaces.tobago.internal.util.RenderUtils;
import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
import org.apache.myfaces.tobago.renderkit.html.DataAttributes;
@@ -189,7 +188,7 @@ public class TreeListboxRenderer extends
}
for (final UIComponent child : tree.getChildren()) {
- RenderUtils.encode(facesContext, child);
+ child.encodeAll(facesContext);
}
if (tree.isFolder()) {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeRenderer.java?rev=1805280&r1=1805279&r2=1805280&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeRenderer.java Thu Aug 17 12:54:55 2017
@@ -127,7 +127,7 @@ public class TreeRenderer extends Render
}
for (final UIComponent child : tree.getChildren()) {
- RenderUtils.encode(facesContext, child);
+ child.encodeAll(facesContext);
}
}
tree.setRowIndex(-1);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ArrayUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ArrayUtils.java?rev=1805280&r1=1805279&r2=1805280&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ArrayUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ArrayUtils.java Thu Aug 17 12:54:55 2017
@@ -23,12 +23,16 @@ public class ArrayUtils {
public static final String[] EMPTY_STRING_ARRAY = new String[0];
- public static boolean contains(final String[] array, final String markup) {
- for (final String anArray : array) {
- if (markup.equals(anArray)) {
+ public static <T> boolean contains(final T[] list, final T value) {
+ if (list == null) {
+ return false;
+ }
+ for (final T element : list) {
+ if (element == value || element != null && element.equals(value)) {
return true;
}
}
return false;
}
+
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java?rev=1805280&r1=1805279&r2=1805280&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java Thu Aug 17 12:54:55 2017
@@ -209,9 +209,9 @@ public final class HtmlRendererUtils {
final String formattedValue = ComponentUtils.getFormattedValue(facesContext, component, itemValue);
boolean contains;
if (submittedValues == null) {
- contains = RenderUtils.contains(values, itemValue);
+ contains = ArrayUtils.contains(values, itemValue);
} else {
- contains = RenderUtils.contains(submittedValues, formattedValue);
+ contains = ArrayUtils.contains(submittedValues, formattedValue);
}
if (onlySelected != null) {
if (onlySelected) {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/RenderUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/RenderUtils.java?rev=1805280&r1=1805279&r2=1805280&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/RenderUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/RenderUtils.java Thu Aug 17 12:54:55 2017
@@ -59,28 +59,36 @@ public final class RenderUtils {
// to prevent instantiation
}
+ /**
+ * @deprecated since 4.0.0. Use {@link ArrayUtils#contains(Object[], Object)}
+ */
+ @Deprecated
public static boolean contains(final Object[] list, final Object value) {
- if (list == null) {
- return false;
- }
- for (final Object aList : list) {
- if (aList != null && aList.equals(value)) {
- return true;
- }
- }
- return false;
+ return ArrayUtils.contains(list, value);
}
+ /**
+ * @deprecated since 4.0.0. Use {@link UIComponent#encodeChildren(FacesContext)}
+ */
+ @Deprecated
public static void encodeChildren(final FacesContext facesContext, final UIComponent panel) throws IOException {
for (final UIComponent child : panel.getChildren()) {
- encode(facesContext, child);
+ child.encodeAll(facesContext);
}
}
+ /**
+ * @deprecated since 4.0.0. Use {@link UIComponent#encodeAll(FacesContext)}
+ */
+ @Deprecated
public static void encode(final FacesContext facesContext, final UIComponent component) throws IOException {
encode(facesContext, component, null);
}
+ /**
+ * @deprecated since 4.0.0. Use {@link UIComponent#encodeAll(FacesContext)}
+ */
+ @Deprecated
public static void encode(
final FacesContext facesContext, final UIComponent component,
final List<? extends Class<? extends UIComponent>> only)
@@ -106,6 +114,10 @@ public final class RenderUtils {
}
}
+ /**
+ * @deprecated since 4.0.0
+ */
+ @Deprecated
private static boolean matchFilter(
final UIComponent component, final List<? extends Class<? extends UIComponent>> only) {
for (final Class<? extends UIComponent> clazz : only) {
Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SplitLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SplitLayoutRenderer.java?rev=1805280&r1=1805279&r2=1805280&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SplitLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SplitLayoutRenderer.java Thu Aug 17 12:54:55 2017
@@ -29,7 +29,6 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
import org.apache.myfaces.tobago.renderkit.html.MarkupLanguageAttributes;
import org.apache.myfaces.tobago.internal.renderkit.renderer.GridLayoutRenderer;
-import org.apache.myfaces.tobago.internal.util.RenderUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -78,8 +77,8 @@ public class SplitLayoutRenderer extends
if (components.size() != 2) {
LOG.warn("Illegal component count in splitLayout: {}", components.size());
}
- RenderUtils.encode(facesContext, components.get(0));
- RenderUtils.encode(facesContext, components.get(1));
+ components.get(0).encodeAll(facesContext);
+ components.get(1).encodeAll(facesContext);
if (components.get(0).isRendered() && components.get(1).isRendered()) {
// only when both components are rendered
encodeHandle(facesContext, (AbstractUISplitLayout) component);