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 2016/07/06 14:19:17 UTC
svn commit: r1751685 [1/2] - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/
tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/
tobago-core/src/test/java/org/apache/myfaces/tobago/internal/con...
Author: lofwyr
Date: Wed Jul 6 14:19:17 2016
New Revision: 1751685
URL: http://svn.apache.org/viewvc?rev=1751685&view=rev
Log:
TOBAGO-1567: Clean up: consolidate getFormattedValue() and other methods.
* Method getResponseWriter() in RendererBase
Removed:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDivider.java
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDividerUnitTest.java
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SplitLayoutRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/BarRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/BoxRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ButtonRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ButtonsRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CalendarRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRendererBase.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandsRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/DateRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FileRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlexLayoutRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlowLayoutRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FooterRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/GridLayoutRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/HeaderRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/HiddenRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ImageRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/InRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelLayoutRendererBase.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MediatorRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuBarRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuSeparatorRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MessagesRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ObjectRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/OutRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PanelRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PopupRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ProgressRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SectionRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SegmentLayoutRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectBooleanCheckboxRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyCheckboxRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyListboxRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneListboxRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneRadioRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SuggestRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TextareaRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRendererBase.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRendererOld.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeIconRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeIndentRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeLabelRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeListboxRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeNodeRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeSelectRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/VerbatimRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java Wed Jul 6 14:19:17 2016
@@ -19,12 +19,15 @@
package org.apache.myfaces.tobago.renderkit;
+import org.apache.myfaces.tobago.internal.webapp.TobagoResponseWriterWrapper;
import org.apache.myfaces.tobago.util.ComponentUtils;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.component.EditableValueHolder;
import javax.faces.component.UIComponent;
import javax.faces.component.ValueHolder;
import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
import javax.faces.render.Renderer;
@@ -70,4 +73,13 @@ public class RendererBase extends Render
public void onComponentCreated(
final FacesContext facesContext, final UIComponent component, final UIComponent parent) {
}
+
+ public TobagoResponseWriter getResponseWriter(final FacesContext facesContext) {
+ final ResponseWriter writer = facesContext.getResponseWriter();
+ if (writer instanceof TobagoResponseWriter) {
+ return (TobagoResponseWriter) writer;
+ } else {
+ return new TobagoResponseWriterWrapper(writer);
+ }
+ }
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java Wed Jul 6 14:19:17 2016
@@ -54,7 +54,7 @@ public class NumberSliderRenderer extend
final boolean disabled = slider.isDisabled();
final Integer min = slider.getMin();
final Integer max = slider.getMax();
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
// final Style style = slider.getStyle();
// final int width = -1;
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=1751685&r1=1751684&r2=1751685&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 Wed Jul 6 14:19:17 2016
@@ -84,7 +84,7 @@ public class SplitLayoutRenderer extends
protected void encodeHandle(final FacesContext facesContext, final AbstractUISplitLayout layout) throws IOException {
final String id = layout.getClientId(facesContext);
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.startElement(HtmlElements.SPAN);
writer.writeIdAttribute(id);
writer.writeAttribute(SPLIT_LAYOUT, layout.getOrientation().name(), false);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/BarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/BarRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/BarRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/BarRenderer.java Wed Jul 6 14:19:17 2016
@@ -49,7 +49,7 @@ public class BarRenderer extends Rendere
public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
final UIBar bar = (UIBar) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final String clientId = bar.getClientId(facesContext);
final String navbarId = clientId + "::navbar";
@@ -78,7 +78,7 @@ public class BarRenderer extends Rendere
@Override
public void encodeChildren(FacesContext facesContext, UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
List<UIComponent> itemsToEncode = new ArrayList<UIComponent>();
collectItemsToEncode(component, itemsToEncode);
@@ -104,7 +104,7 @@ public class BarRenderer extends Rendere
@Override
public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.DIV);
writer.endElement(HtmlElements.DIV);
writer.endElement(HtmlElements.DIV);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/BoxRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/BoxRenderer.java Wed Jul 6 14:19:17 2016
@@ -43,7 +43,7 @@ public class BoxRenderer extends PanelRe
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final AbstractUIBox box = (AbstractUIBox) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final UIComponent label = ComponentUtils.getFacet(box, Facets.label);
final String labelString = box.getLabel();
@@ -107,7 +107,7 @@ public class BoxRenderer extends PanelRe
@Override
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.DIV);
writer.endElement(HtmlElements.DIV);
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ButtonRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ButtonRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ButtonRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ButtonRenderer.java Wed Jul 6 14:19:17 2016
@@ -39,7 +39,7 @@ public class ButtonRenderer extends Comm
@Override
protected void encodeBeginElement(final FacesContext facesContext, final AbstractUICommand command)
throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.startElement(HtmlElements.BUTTON);
writer.writeAttribute(HtmlAttributes.TYPE, HtmlButtonTypes.BUTTON);
@@ -48,7 +48,7 @@ public class ButtonRenderer extends Comm
@Override
protected void encodeEndElement(final FacesContext facesContext, final AbstractUICommand command)
throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.BUTTON);
}
@@ -56,7 +56,7 @@ public class ButtonRenderer extends Comm
@Override
protected void encodeBeginOuter(final FacesContext facesContext, final AbstractUICommand command)
throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
// if (isMarked(facesContext, MARKER)) { // this is only needed, if button has a sub-menu (dropdown)
writer.startElement(HtmlElements.SPAN);
@@ -67,7 +67,7 @@ public class ButtonRenderer extends Comm
@Override
protected void encodeEndOuter(final FacesContext facesContext, final AbstractUICommand command)
throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
// if (isMarked(facesContext, MARKER)) {
writer.endElement(HtmlElements.SPAN);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ButtonsRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ButtonsRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ButtonsRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ButtonsRenderer.java Wed Jul 6 14:19:17 2016
@@ -39,7 +39,7 @@ public class ButtonsRenderer extends Ren
public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
final AbstractUIButtons buttons = (AbstractUIButtons) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.startElement(HtmlElements.DIV);
writer.writeIdAttribute(buttons.getClientId(facesContext));
@@ -55,7 +55,7 @@ public class ButtonsRenderer extends Ren
@Override
public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.DIV);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CalendarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CalendarRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CalendarRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CalendarRenderer.java Wed Jul 6 14:19:17 2016
@@ -37,7 +37,7 @@ public class CalendarRenderer extends Re
final UICalendar output = (UICalendar) component;
final String id = output.getClientId(facesContext);
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.startElement(HtmlElements.SPAN);
writer.writeIdAttribute(id);
writer.writeText("[tc:calender is currently not implemented]");
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRenderer.java Wed Jul 6 14:19:17 2016
@@ -32,21 +32,21 @@ public class CommandRenderer extends Com
@Override
protected void encodeBeginElement(final FacesContext facesContext, final AbstractUICommand command)
throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.startElement(HtmlElements.A);
}
@Override
protected void encodeEndElement(final FacesContext facesContext, final AbstractUICommand command)
throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.A);
}
@Override
protected void encodeBeginOuter(final FacesContext facesContext, final AbstractUICommand command)
throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
// writer.startElement(HtmlElements.SPAN);
// XXX this class fixes the problem, that the submenu are not opened at correct position, but
@@ -57,7 +57,7 @@ public class CommandRenderer extends Com
@Override
protected void encodeEndOuter(final FacesContext facesContext, final AbstractUICommand command)
throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
// writer.endElement(HtmlElements.SPAN);
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRendererBase.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRendererBase.java Wed Jul 6 14:19:17 2016
@@ -82,7 +82,7 @@ public abstract class CommandRendererBas
final boolean disabled = command.isDisabled();
final LabelWithAccessKey label = new LabelWithAccessKey(command);
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
if (command.isParentOfCommands()) {
encodeBeginOuter(facesContext, command);
@@ -188,7 +188,7 @@ public abstract class CommandRendererBas
final AbstractUICommand link = (AbstractUICommand) component;
if (link.isParentOfCommands()) {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
for (UIComponent child : component.getChildren()) {
if (child.isRendered()) {
@@ -213,7 +213,7 @@ public abstract class CommandRendererBas
final AbstractUICommand command = (AbstractUICommand) component;
if (command.isParentOfCommands()) {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.UL);
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandsRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandsRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandsRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandsRenderer.java Wed Jul 6 14:19:17 2016
@@ -37,7 +37,7 @@ public class CommandsRenderer extends Re
@Override
public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.startElement(HtmlElements.UL);
writer.writeClassAttribute(BootstrapClass.NAV, BootstrapClass.NAVBAR_NAV);
writer.writeIdAttribute(component.getClientId(facesContext));
@@ -50,7 +50,7 @@ public class CommandsRenderer extends Re
@Override
public void encodeChildren(FacesContext facesContext, UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
for (UIComponent child : component.getChildren()) {
if (child.isRendered()) {
@@ -70,7 +70,7 @@ public class CommandsRenderer extends Re
@Override
public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.UL);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/DateRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/DateRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/DateRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/DateRenderer.java Wed Jul 6 14:19:17 2016
@@ -60,7 +60,7 @@ public class DateRenderer extends InRend
@Override
protected void encodeBeginField(FacesContext facesContext, UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(TobagoClass.PANEL);
@@ -78,7 +78,7 @@ public class DateRenderer extends InRend
final AbstractUIDate date = (AbstractUIDate) component;
final String pattern = date.getPattern();
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.startElement(HtmlElements.SPAN);
writer.writeClassAttribute(BootstrapClass.INPUT_GROUP_BTN);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FileRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FileRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FileRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FileRenderer.java Wed Jul 6 14:19:17 2016
@@ -100,7 +100,7 @@ public class FileRenderer extends LabelL
final String fieldId = file.getFieldId(facesContext);
final String accept = createAcceptFromValidators(file);
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(Classes.create(file), file.getCustomClass());
@@ -175,7 +175,7 @@ public class FileRenderer extends LabelL
@Override
protected void encodeEndField(FacesContext facesContext, UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.DIV);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlexLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlexLayoutRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlexLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlexLayoutRenderer.java Wed Jul 6 14:19:17 2016
@@ -38,7 +38,7 @@ public class FlexLayoutRenderer extends
@Override
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final UIFlexLayout flexLayout = (UIFlexLayout) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.startElement(HtmlElements.DIV);
writer.writeIdAttribute(flexLayout.getClientId());
@@ -90,7 +90,7 @@ public class FlexLayoutRenderer extends
@Override
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.DIV);
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlowLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlowLayoutRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlowLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlowLayoutRenderer.java Wed Jul 6 14:19:17 2016
@@ -38,7 +38,7 @@ public class FlowLayoutRenderer extends
@Override
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final UIFlowLayout layout = (UIFlowLayout) component;
writer.startElement(HtmlElements.DIV);
@@ -65,7 +65,7 @@ public class FlowLayoutRenderer extends
@Override
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.DIV);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FooterRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FooterRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FooterRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FooterRenderer.java Wed Jul 6 14:19:17 2016
@@ -36,7 +36,7 @@ public class FooterRenderer extends Rend
@Override
public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final UIFooter footer = (UIFooter) component;
writer.startElement(HtmlElements.FOOTER);
writer.writeIdAttribute(component.getClientId(facesContext));
@@ -51,7 +51,7 @@ public class FooterRenderer extends Rend
@Override
public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.FOOTER);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/GridLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/GridLayoutRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/GridLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/GridLayoutRenderer.java Wed Jul 6 14:19:17 2016
@@ -34,7 +34,6 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlRoleValues;
import org.apache.myfaces.tobago.renderkit.html.JsonUtils;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -54,7 +53,7 @@ public class GridLayoutRenderer extends
@Override
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final AbstractUIGridLayout gridLayout = (AbstractUIGridLayout) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.startElement(HtmlElements.TABLE);
writer.writeAttribute(HtmlAttributes.ROLE, HtmlRoleValues.PRESENTATION.toString(), false);
@@ -93,7 +92,7 @@ public class GridLayoutRenderer extends
RenderUtils.encodeChildren(facesContext, container);
*/
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final Grid grid = gridLayout.getGrid();
final int columns = grid.getColumnCount();
final int rows = grid.getRowCount();
@@ -152,7 +151,7 @@ public class GridLayoutRenderer extends
@Override
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.TBODY);
writer.endElement(HtmlElements.TABLE);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/HeaderRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/HeaderRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/HeaderRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/HeaderRenderer.java Wed Jul 6 14:19:17 2016
@@ -36,7 +36,7 @@ public class HeaderRenderer extends Rend
@Override
public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final UIHeader header = (UIHeader) component;
writer.startElement(HtmlElements.HEADER);
writer.writeIdAttribute(component.getClientId(facesContext));
@@ -55,7 +55,7 @@ public class HeaderRenderer extends Rend
@Override
public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.HEADER);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/HiddenRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/HiddenRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/HiddenRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/HiddenRenderer.java Wed Jul 6 14:19:17 2016
@@ -42,7 +42,7 @@ public class HiddenRenderer extends Deco
final String clientId = hidden.getClientId(facesContext);
final String value = RenderUtils.currentValue(hidden);
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.startElement(HtmlElements.INPUT);
if (hidden.isDisabled()) {
@@ -62,7 +62,7 @@ public class HiddenRenderer extends Deco
@Override
public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.INPUT);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ImageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ImageRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ImageRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ImageRenderer.java Wed Jul 6 14:19:17 2016
@@ -41,7 +41,7 @@ public class ImageRenderer extends Rende
@Override
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final AbstractUIImage image = (AbstractUIImage) component;
final String value = image.getUrl();
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/InRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/InRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/InRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/InRenderer.java Wed Jul 6 14:19:17 2016
@@ -64,7 +64,7 @@ public class InRenderer extends LabelLay
final boolean disabled = input.isDisabled();
final boolean required = ComponentUtils.getBooleanAttribute(input, Attributes.required);
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final UIComponent after = ComponentUtils.getFacet(input, Facets.after);
final UIComponent before = ComponentUtils.getFacet(input, Facets.before);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelLayoutRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelLayoutRendererBase.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelLayoutRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelLayoutRendererBase.java Wed Jul 6 14:19:17 2016
@@ -96,7 +96,7 @@ public abstract class LabelLayoutRendere
protected void encodeBeginSurrounding(final FacesContext facesContext, final UIComponent component)
throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
// possible values:
// - none
@@ -170,7 +170,7 @@ public abstract class LabelLayoutRendere
protected void encodeEndSurrounding(final FacesContext facesContext, final UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final LabelLayout labelLayout = getType(component);
switch (labelLayout) {
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelRenderer.java Wed Jul 6 14:19:17 2016
@@ -54,7 +54,7 @@ public class LabelRenderer extends Rende
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final UILabel label = (UILabel) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final UIComponent corresponding = ComponentUtils.findFor(label);
final String forId;
if (corresponding instanceof SupportFieldId) {
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MediatorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MediatorRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MediatorRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MediatorRenderer.java Wed Jul 6 14:19:17 2016
@@ -39,7 +39,7 @@ public class MediatorRenderer extends Re
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final UIMediator mediator = (UIMediator) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.startElement(HtmlElements.DIV);
HtmlRendererUtils.writeDataAttributes(facesContext, writer, mediator);
writer.writeStyleAttribute(mediator.getStyle());
@@ -49,7 +49,7 @@ public class MediatorRenderer extends Re
@Override
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.DIV);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuBarRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuBarRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuBarRenderer.java Wed Jul 6 14:19:17 2016
@@ -38,7 +38,7 @@ public class MenuBarRenderer extends Ren
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final UIMenuBar menuBar = (UIMenuBar) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.startElement(HtmlElements.UL);
writer.writeIdAttribute(menuBar.getClientId(facesContext));
@@ -54,7 +54,7 @@ public class MenuBarRenderer extends Ren
@Override
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.UL);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuRenderer.java Wed Jul 6 14:19:17 2016
@@ -44,7 +44,7 @@ public class MenuRenderer extends Render
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final UIMenu menu = (UIMenu) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final LabelWithAccessKey label = new LabelWithAccessKey(menu);
final boolean disabled = menu.isDisabled();
@@ -113,7 +113,7 @@ public class MenuRenderer extends Render
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final UIMenu menu = (UIMenu) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final boolean isParentMenu = menu.getChildCount() > 0; // todo: may be not correct
if (isParentMenu) {
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuSeparatorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuSeparatorRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuSeparatorRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuSeparatorRenderer.java Wed Jul 6 14:19:17 2016
@@ -33,7 +33,7 @@ public class MenuSeparatorRenderer exten
@Override
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.startElement(HtmlElements.LI);
writer.writeClassAttribute(Classes.create(component));
writer.startElement(HtmlElements.HR);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MessagesRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MessagesRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MessagesRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MessagesRenderer.java Wed Jul 6 14:19:17 2016
@@ -55,7 +55,7 @@ public class MessagesRenderer extends Re
LOG.warn("'confirmation' is currently not supported for tc:messages!");
}
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
if (LOG.isDebugEnabled()) {
LOG.debug("facesContext is " + facesContext.getClass().getName());
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ObjectRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ObjectRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ObjectRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ObjectRenderer.java Wed Jul 6 14:19:17 2016
@@ -36,7 +36,7 @@ public class ObjectRenderer extends Rend
@Override
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final UIObject object = (UIObject) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.startElement(HtmlElements.IFRAME);
writer.writeAttribute(HtmlAttributes.FRAMEBORDER, "0", false);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/OutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/OutRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/OutRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/OutRenderer.java Wed Jul 6 14:19:17 2016
@@ -48,7 +48,7 @@ public class OutRenderer extends LabelLa
text = "";
}
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final boolean escape = out.isEscape();
final boolean createSpan = out.isCreateSpan();
@@ -87,7 +87,7 @@ public class OutRenderer extends LabelLa
public void encodeEndField(final FacesContext facesContext, final UIComponent component) throws IOException {
final UIOut out = (UIOut) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final boolean createSpan = out.isCreateSpan();
if (createSpan) {
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java Wed Jul 6 14:19:17 2016
@@ -104,7 +104,7 @@ public class PageRenderer extends Render
if (FacesContextUtils.getFocusId(facesContext) == null && !StringUtils.isBlank(page.getFocusId())) {
FacesContextUtils.setFocusId(facesContext, page.getFocusId());
}
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
// reset responseWriter and render page
facesContext.setResponseWriter(writer);
@@ -334,7 +334,7 @@ public class PageRenderer extends Render
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final UIPage page = (UIPage) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
/*
writer.endElement(HtmlElements.DIV);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PanelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PanelRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PanelRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PanelRenderer.java Wed Jul 6 14:19:17 2016
@@ -42,7 +42,7 @@ public class PanelRenderer extends Panel
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final UIPanel panel = (UIPanel) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final String clientId = panel.getClientId(facesContext);
final boolean collapsed = panel.isCollapsed();
@@ -75,7 +75,7 @@ public class PanelRenderer extends Panel
@Override
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.DIV);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PopupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PopupRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PopupRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PopupRenderer.java Wed Jul 6 14:19:17 2016
@@ -38,7 +38,7 @@ public class PopupRenderer extends Panel
public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
final AbstractUIPopup popup = (AbstractUIPopup) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final String clientId = popup.getClientId(facesContext);
final boolean collapsed = popup.isCollapsed();
@@ -66,7 +66,7 @@ public class PopupRenderer extends Panel
@Override
public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.DIV);
writer.endElement(HtmlElements.DIV);
writer.endElement(HtmlElements.DIV);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ProgressRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ProgressRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ProgressRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ProgressRenderer.java Wed Jul 6 14:19:17 2016
@@ -52,7 +52,7 @@ public class ProgressRenderer extends Re
title = Integer.toString((int) (value / max)) + " %";
}
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.startElement(HtmlElements.PROGRESS);
writer.writeIdAttribute(progress.getClientId(facesContext));
@@ -72,7 +72,7 @@ public class ProgressRenderer extends Re
@Override
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.PROGRESS);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SectionRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SectionRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SectionRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SectionRenderer.java Wed Jul 6 14:19:17 2016
@@ -39,7 +39,7 @@ public class SectionRenderer extends Pan
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final AbstractUISection section = (AbstractUISection) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final String clientId = section.getClientId(facesContext);
final boolean collapsed = section.isCollapsed();
@@ -96,7 +96,7 @@ public class SectionRenderer extends Pan
@Override
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.DIV);
writer.endElement(HtmlElements.DIV);
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SegmentLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SegmentLayoutRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SegmentLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SegmentLayoutRenderer.java Wed Jul 6 14:19:17 2016
@@ -55,7 +55,7 @@ public class SegmentLayoutRenderer exten
@Override
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final AbstractUISegmentLayout layout = (AbstractUISegmentLayout) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.startElement(HtmlElements.DIV);
// writer.writeClassAttribute(BootstrapClass.FORM_HORIZONTAL, BootstrapClass.CONTAINER_FLUID);
@@ -66,7 +66,7 @@ public class SegmentLayoutRenderer exten
@Override
public void encodeChildren(final FacesContext facesContext, final UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final UISegmentLayout segmentLayout = (UISegmentLayout) component;
if (!segmentLayout.isRendered()) {
@@ -127,7 +127,7 @@ public class SegmentLayoutRenderer exten
@Override
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.DIV);
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectBooleanCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectBooleanCheckboxRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectBooleanCheckboxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectBooleanCheckboxRenderer.java Wed Jul 6 14:19:17 2016
@@ -78,7 +78,7 @@ public class SelectBooleanCheckboxRender
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final UISelectBooleanCheckbox select = (UISelectBooleanCheckbox) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final String clientId = select.getClientId(facesContext);
final String fieldId = select.getFieldId(facesContext);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyCheckboxRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyCheckboxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyCheckboxRenderer.java Wed Jul 6 14:19:17 2016
@@ -42,7 +42,7 @@ public class SelectManyCheckboxRenderer
@Override
public void encodeBeginField(final FacesContext facesContext, final UIComponent component) throws IOException {
final UISelectManyCheckbox select = (UISelectManyCheckbox) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final String id = select.getClientId(facesContext);
final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, select);
@@ -112,7 +112,7 @@ public class SelectManyCheckboxRenderer
@Override
public void encodeEndField(final FacesContext facesContext, final UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.OL);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyListboxRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyListboxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyListboxRenderer.java Wed Jul 6 14:19:17 2016
@@ -47,7 +47,7 @@ public class SelectManyListboxRenderer e
@Override
public void encodeBeginField(final FacesContext facesContext, final UIComponent component) throws IOException {
final UISelectManyListbox select = (UISelectManyListbox) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final String clientId = select.getClientId(facesContext);
final String fieldId = select.getFieldId(facesContext);
@@ -86,7 +86,7 @@ public class SelectManyListboxRenderer e
@Override
public void encodeEndField(final FacesContext facesContext, final UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.SELECT);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java Wed Jul 6 14:19:17 2016
@@ -44,7 +44,7 @@ public class SelectManyShuttleRenderer e
@Override
public void encodeBeginField(final FacesContext facesContext, final UIComponent component) throws IOException {
final UISelectManyShuttle select = (UISelectManyShuttle) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(Classes.create(select), select.getCustomClass());
final String clientId = select.getClientId(facesContext);
@@ -139,7 +139,7 @@ public class SelectManyShuttleRenderer e
@Override
public void encodeEndField(final FacesContext facesContext, final UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.DIV);
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java Wed Jul 6 14:19:17 2016
@@ -46,7 +46,7 @@ public class SelectOneChoiceRenderer ext
@Override
protected void encodeBeginField(FacesContext facesContext, UIComponent component) throws IOException {
final UISelectOneChoice select = (UISelectOneChoice) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final String clientId = select.getClientId(facesContext);
final String fieldId = select.getFieldId(facesContext);
@@ -80,7 +80,7 @@ public class SelectOneChoiceRenderer ext
@Override
protected void encodeEndField(FacesContext facesContext, UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.SELECT);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneListboxRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneListboxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneListboxRenderer.java Wed Jul 6 14:19:17 2016
@@ -47,7 +47,7 @@ public class SelectOneListboxRenderer ex
@Override
public void encodeBeginField(final FacesContext facesContext, final UIComponent component) throws IOException {
final UISelectOneListbox select = (UISelectOneListbox) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final String clientId = select.getClientId(facesContext);
final String fieldId = select.getFieldId(facesContext);
@@ -84,7 +84,7 @@ public class SelectOneListboxRenderer ex
@Override
protected void encodeEndField(FacesContext facesContext, UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.SELECT);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneRadioRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneRadioRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneRadioRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneRadioRenderer.java Wed Jul 6 14:19:17 2016
@@ -44,7 +44,7 @@ public class SelectOneRadioRenderer exte
@Override
protected void encodeBeginField(FacesContext facesContext, UIComponent component) throws IOException {
final UISelectOneRadio select = (UISelectOneRadio) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final String id = select.getClientId(facesContext);
final Iterable<SelectItem> items = SelectItemUtils.getItemIterator(facesContext, select);
@@ -128,7 +128,7 @@ public class SelectOneRadioRenderer exte
@Override
protected void encodeEndField(FacesContext facesContext, UIComponent component) throws IOException {
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.endElement(HtmlElements.OL);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java Wed Jul 6 14:19:17 2016
@@ -39,7 +39,7 @@ public class SeparatorRenderer extends R
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final UISeparator separator = (UISeparator) component;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final String clientId = separator.getClientId(facesContext);
final String label = getLabel(separator);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java?rev=1751685&r1=1751684&r2=1751685&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java Wed Jul 6 14:19:17 2016
@@ -152,7 +152,7 @@ public class SheetRenderer extends Rende
final UISheet sheet = (UISheet) component;
final String sheetId = sheet.getClientId(facesContext);
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
UIComponent header = sheet.getHeader();
if (header == null) {
@@ -221,7 +221,7 @@ public class SheetRenderer extends Rende
public void encodeEnd(final FacesContext facesContext, final UIComponent uiComponent) throws IOException {
final UISheet sheet = (UISheet) uiComponent;
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
final boolean rowAction = renderSheetCommands(sheet, facesContext, writer);
final String sheetId = sheet.getClientId(facesContext);
@@ -1024,7 +1024,7 @@ public class SheetRenderer extends Rende
final String message = ResourceManagerUtils.getPropertyNotNull(facesContext, "tobago", "sheet" + action.getToken());
final String tip = new MessageFormat(message, locale).format(new Integer[]{target}); // needed fot ToPage
- final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.startElement(HtmlElements.LI);
writer.writeClassAttribute(liClass, disabled ? BootstrapClass.DISABLED : null, BootstrapClass.PAGE_ITEM);
writer.startElement(HtmlElements.A);