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/02/12 16:09:27 UTC
svn commit: r1730041 - in /myfaces/tobago/branches/tobago-3.0.x:
tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/
tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/util/
tobago-core/src/main/java/org/apache/myfaces/tobago/util...
Author: lofwyr
Date: Fri Feb 12 15:09:26 2016
New Revision: 1730041
URL: http://svn.apache.org/viewvc?rev=1730041&view=rev
Log:
Preparation of TOBAGO-1524
* using ComponentSystemEvents in the Renderers to make initializations instead of "prepareRenderer()"
Removed:
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBaseWrapper.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/util/EncodeUtils.java
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/util/EncodeAjaxCallback.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ColumnRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FileRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PopupRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ScriptRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/StyleRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeListboxRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java?rev=1730041&r1=1730040&r2=1730041&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java Fri Feb 12 15:09:26 2016
@@ -37,19 +37,6 @@ public abstract class AbstractRendererBa
}
@Override
- public final void prepareRender(final FacesContext facesContext, final UIComponent component) {
- getRenderer(facesContext).prepareRender(facesContext, component);
- }
- @Override
- public final boolean getPrepareRendersChildren() {
- return getRenderer(FacesContext.getCurrentInstance()).getPrepareRendersChildren();
- }
- @Override
- public final void prepareRendersChildren(final FacesContext context, final UIComponent component) throws IOException {
- getRenderer(context).prepareRendersChildren(context, component);
- }
-
- @Override
public final boolean getRendersChildren() {
return getRenderer(FacesContext.getCurrentInstance()).getRendersChildren();
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java?rev=1730041&r1=1730040&r2=1730041&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java Fri Feb 12 15:09:26 2016
@@ -35,7 +35,6 @@ import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
import javax.faces.render.Renderer;
-import java.io.IOException;
public class RendererBase extends Renderer {
@@ -43,19 +42,6 @@ public class RendererBase extends Render
private ResourceManager resourceManager;
- /**
- * Hook to e. g. register resources, etc.
- */
- public void prepareRender(final FacesContext facesContext, final UIComponent component) {
- }
-
- public boolean getPrepareRendersChildren() {
- return false;
- }
-
- public void prepareRendersChildren(final FacesContext context, final UIComponent component) throws IOException {
- }
-
protected Object getCurrentValueAsObject(final UIInput input) {
final Object submittedValue = input.getSubmittedValue();
if (submittedValue != null) {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java?rev=1730041&r1=1730040&r2=1730041&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java Fri Feb 12 15:09:26 2016
@@ -70,9 +70,6 @@ public class TobagoRenderKit extends Ren
Renderer renderer = renderers.get(new Key(family, rendererType));
if (renderer == null) {
renderer = htmlBasicRenderKit.getRenderer(family, rendererType);
- if (renderer != null) {
- renderer = new RendererBaseWrapper(renderer);
- }
}
if (renderer == null) {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/util/EncodeAjaxCallback.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/util/EncodeAjaxCallback.java?rev=1730041&r1=1730040&r2=1730041&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/util/EncodeAjaxCallback.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/util/EncodeAjaxCallback.java Fri Feb 12 15:09:26 2016
@@ -22,7 +22,6 @@ package org.apache.myfaces.tobago.util;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.Facets;
-import org.apache.myfaces.tobago.renderkit.util.EncodeUtils;
import javax.faces.FacesException;
import javax.faces.component.UIComponent;
@@ -44,7 +43,6 @@ public class EncodeAjaxCallback implemen
}
}
}
- EncodeUtils.prepareRendererAll(facesContext, component);
component.encodeAll(facesContext);
} catch (final IOException e) {
throw new FacesException(e);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=1730041&r1=1730040&r2=1730041&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Fri Feb 12 15:09:26 2016
@@ -52,7 +52,6 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
import org.apache.myfaces.tobago.renderkit.html.JsonUtils;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
-import org.apache.myfaces.tobago.renderkit.util.EncodeUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -294,7 +293,6 @@ LOG.info("" + column);
} else if (column instanceof UIColumn) {
for (final UIComponent grandKid : column.getChildren()) {
if (grandKid.isRendered()) {
- EncodeUtils.prepareRendererAll(facesContext, grandKid);
RenderUtils.encode(facesContext, grandKid);
}
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ColumnRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ColumnRenderer.java?rev=1730041&r1=1730040&r2=1730041&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ColumnRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ColumnRenderer.java Fri Feb 12 15:09:26 2016
@@ -22,14 +22,9 @@ package org.apache.myfaces.tobago.render
import org.apache.myfaces.tobago.component.UIColumn;
import org.apache.myfaces.tobago.component.UILink;
import org.apache.myfaces.tobago.component.UIOut;
-import org.apache.myfaces.tobago.internal.component.AbstractUIMenu;
import org.apache.myfaces.tobago.renderkit.RendererBase;
-import org.apache.myfaces.tobago.renderkit.util.EncodeUtils;
-import org.apache.myfaces.tobago.util.FacetUtils;
import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import java.io.IOException;
public class ColumnRenderer extends RendererBase {
@@ -51,19 +46,6 @@ public class ColumnRenderer extends Rend
}
@Override
- public boolean getPrepareRendersChildren() {
- return true;
- }
-
- @Override
- public void prepareRendersChildren(final FacesContext facesContext, final UIComponent component) throws IOException {
- final AbstractUIMenu dropDownMenu = FacetUtils.getDropDownMenu(component);
- if (dropDownMenu != null) {
- EncodeUtils.prepareRendererAll(facesContext, dropDownMenu);
- }
- }
-
- @Override
public boolean getRendersChildren() {
return true;
}
Modified: myfaces/tobago/branches/tobago-3.0.x/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/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FileRenderer.java?rev=1730041&r1=1730040&r2=1730041&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FileRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FileRenderer.java Fri Feb 12 15:09:26 2016
@@ -35,16 +35,22 @@ import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import javax.faces.event.ComponentSystemEvent;
+import javax.faces.event.ComponentSystemEventListener;
+import javax.faces.event.ListenerFor;
+import javax.faces.event.PostAddToViewEvent;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import java.io.IOException;
-public class FileRenderer extends InputRendererBase {
+@ListenerFor(systemEventClass = PostAddToViewEvent.class)
+public class FileRenderer extends InputRendererBase implements ComponentSystemEventListener {
private static final Logger LOG = LoggerFactory.getLogger(FileRenderer.class);
- public void prepareRender(final FacesContext facesContext, final UIComponent component) {
- super.prepareRender(facesContext, component);
+ @Override
+ public void processEvent(ComponentSystemEvent event) {
+ final FacesContext facesContext = FacesContext.getCurrentInstance();
FacesContextUtils.setEnctype(facesContext, "multipart/form-data");
}
Modified: myfaces/tobago/branches/tobago-3.0.x/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/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelRenderer.java?rev=1730041&r1=1730040&r2=1730041&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelRenderer.java Fri Feb 12 15:09:26 2016
@@ -31,25 +31,25 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
+import javax.faces.event.ComponentSystemEvent;
+import javax.faces.event.ComponentSystemEventListener;
+import javax.faces.event.ListenerFor;
+import javax.faces.event.PostAddToViewEvent;
import java.io.IOException;
-public class LabelRenderer extends RendererBase {
-
- private static final Logger LOG = LoggerFactory.getLogger(LabelRenderer.class);
+@ListenerFor(systemEventClass = PostAddToViewEvent.class)
+public class LabelRenderer extends RendererBase implements ComponentSystemEventListener {
@Override
- public void prepareRender(final FacesContext facesContext, final UIComponent component) {
- super.prepareRender(facesContext, component);
-
- ComponentUtils.evaluateAutoFor(component, UIInput.class);
+ public void processEvent(ComponentSystemEvent event) {
+ ComponentUtils.evaluateAutoFor(event.getComponent(), UIInput.class);
}
+ @Override
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final UILabel label = (UILabel) component;
Modified: myfaces/tobago/branches/tobago-3.0.x/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/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java?rev=1730041&r1=1730040&r2=1730041&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java Fri Feb 12 15:09:26 2016
@@ -44,7 +44,6 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
-import org.apache.myfaces.tobago.renderkit.util.EncodeUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.Secret;
@@ -102,9 +101,6 @@ public class PageRenderer extends Render
final UIPage page = (UIPage) component;
final TobagoConfig tobagoConfig = TobagoConfig.getInstance(facesContext);
- // invoke prepareRender
- EncodeUtils.prepareRendererAll(facesContext, page);
-
if (FacesContextUtils.getFocusId(facesContext) == null && !StringUtils.isBlank(page.getFocusId())) {
FacesContextUtils.setFocusId(facesContext, page.getFocusId());
}
Modified: myfaces/tobago/branches/tobago-3.0.x/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/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PopupRenderer.java?rev=1730041&r1=1730040&r2=1730041&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PopupRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PopupRenderer.java Fri Feb 12 15:09:26 2016
@@ -29,20 +29,25 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.html.HtmlRoleValues;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import javax.faces.event.ComponentSystemEvent;
+import javax.faces.event.ComponentSystemEventListener;
+import javax.faces.event.ListenerFor;
+import javax.faces.event.PostAddToViewEvent;
import java.io.IOException;
-public class PopupRenderer extends RendererBase {
+@ListenerFor(systemEventClass = PostAddToViewEvent.class)
+public class PopupRenderer extends RendererBase implements ComponentSystemEventListener {
@Override
- public void prepareRender(final FacesContext facesContext, final UIComponent component) {
-
- final UIPopup popup = (UIPopup) component;
+ public void processEvent(ComponentSystemEvent event) {
+ final FacesContext facesContext = FacesContext.getCurrentInstance();
+ final UIPopup popup = (UIPopup) event.getComponent();
FacesContextUtils.addPopup(facesContext, popup);
-
- super.prepareRender(facesContext, popup);
}
@Override
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ScriptRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ScriptRenderer.java?rev=1730041&r1=1730040&r2=1730041&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ScriptRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ScriptRenderer.java Fri Feb 12 15:09:26 2016
@@ -23,14 +23,19 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.internal.util.FacesContextUtils;
import org.apache.myfaces.tobago.renderkit.RendererBase;
-import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import javax.faces.event.ComponentSystemEvent;
+import javax.faces.event.ComponentSystemEventListener;
+import javax.faces.event.ListenerFor;
+import javax.faces.event.PostAddToViewEvent;
-public class ScriptRenderer extends RendererBase {
+@ListenerFor(systemEventClass = PostAddToViewEvent.class)
+public class ScriptRenderer extends RendererBase implements ComponentSystemEventListener {
- public void prepareRender(final FacesContext facesContext, final UIComponent component) {
- super.prepareRender(facesContext, component);
- final UIScript scriptComponent = (UIScript) component;
+ @Override
+ public void processEvent(ComponentSystemEvent event) {
+ final FacesContext facesContext = FacesContext.getCurrentInstance();
+ final UIScript scriptComponent = (UIScript) event.getComponent();
final String file = scriptComponent.getFile();
if (file != null) {
FacesContextUtils.addScriptFile(facesContext, file);
Modified: myfaces/tobago/branches/tobago-3.0.x/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/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java?rev=1730041&r1=1730040&r2=1730041&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java Fri Feb 12 15:09:26 2016
@@ -68,7 +68,6 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
import org.apache.myfaces.tobago.renderkit.html.JsonUtils;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
-import org.apache.myfaces.tobago.renderkit.util.EncodeUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.util.CreateComponentUtils;
@@ -100,8 +99,7 @@ public class SheetRenderer extends Rende
protected static final String SELECTOR_DROPDOWN = ComponentUtils.SUB_SEPARATOR + "selectorDropdown";
@Override
- public void prepareRender(final FacesContext facesContext, final UIComponent component) {
- super.prepareRender(facesContext, component);
+ public void encodeBegin(final FacesContext facesContext, final UIComponent component) {
ensureHeader(facesContext, (UISheet) component);
}
@@ -352,12 +350,10 @@ public class SheetRenderer extends Rende
writer.writeClassAttribute(Classes.create(sheet, "columnSelector"));
writer.endElement(HtmlElements.INPUT);
} else if (column instanceof AbstractUIColumnNode) {
- EncodeUtils.prepareRendererAll(facesContext, column);
RenderUtils.encode(facesContext, column);
} else {
final List<UIComponent> children = sheet.getRenderedChildrenOf(column);
for (final UIComponent grandKid : children) {
- EncodeUtils.prepareRendererAll(facesContext, grandKid);
RenderUtils.encode(facesContext, grandKid);
}
}
@@ -1084,47 +1080,4 @@ public class SheetRenderer extends Rende
public void encodeChildren(final FacesContext context, final UIComponent component) throws IOException {
// DO Nothing
}
-
- @Override
- public boolean getPrepareRendersChildren() {
- return true;
- }
-
- @Override
- public void prepareRendersChildren(final FacesContext facesContext, final UIComponent component) throws IOException {
-
- final UISheet sheet = (UISheet) component;
- List<UIComponent> others = new ArrayList<UIComponent>();
- List<UIColumn> columns = new ArrayList<UIColumn>();
-
- for (final UIComponent child : sheet.getChildren()) {
- if (child instanceof UIColumn) {
- columns.add((UIColumn) child);
- } else {
- others.add(child);
- }
- }
-
- // for non-columns: prepare only once (needed for e.g. UIStyle)
- for (UIComponent other : others) {
- EncodeUtils.prepareRendererAll(facesContext, other);
- }
-
- // for columns: prepare for each row
- final int last = sheet.isRowsUnlimited() ? Integer.MAX_VALUE : sheet.getFirst() + sheet.getRows();
- for (int rowIndex = sheet.getFirst(); rowIndex < last; rowIndex++) {
- sheet.setRowIndex(rowIndex);
- if (!sheet.isRowAvailable()) {
- break;
- }
- final Object rowRendered = sheet.getAttributes().get("rowRendered");
- if (rowRendered instanceof Boolean && !((Boolean) rowRendered)) {
- continue;
- }
-
- for (UIComponent column : columns) {
- EncodeUtils.prepareRendererAll(facesContext, column);
- }
- }
- }
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/StyleRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/StyleRenderer.java?rev=1730041&r1=1730040&r2=1730041&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/StyleRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/StyleRenderer.java Fri Feb 12 15:09:26 2016
@@ -30,14 +30,20 @@ import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import javax.faces.event.ComponentSystemEvent;
+import javax.faces.event.ComponentSystemEventListener;
+import javax.faces.event.ListenerFor;
+import javax.faces.event.PostAddToViewEvent;
-public class StyleRenderer extends RendererBase {
+@ListenerFor(systemEventClass = PostAddToViewEvent.class)
+public class StyleRenderer extends RendererBase implements ComponentSystemEventListener {
private static final Logger LOG = LoggerFactory.getLogger(StyleRenderer.class);
- public void prepareRender(final FacesContext facesContext, final UIComponent component) {
- super.prepareRender(facesContext, component);
- final UIStyle styleComponent = (UIStyle) component;
+ @Override
+ public void processEvent(ComponentSystemEvent event) {
+ final FacesContext facesContext = FacesContext.getCurrentInstance();
+ final UIStyle styleComponent = (UIStyle) event.getComponent();
final String file = styleComponent.getFile();
if (file != null) {
FacesContextUtils.addStyleFile(facesContext, file);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeListboxRenderer.java?rev=1730041&r1=1730040&r2=1730041&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeListboxRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeListboxRenderer.java Fri Feb 12 15:09:26 2016
@@ -30,7 +30,6 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
-import org.apache.myfaces.tobago.renderkit.util.EncodeUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -183,7 +182,6 @@ public class TreeListboxRenderer extends
}
for (final UIComponent child : tree.getChildren()) {
- EncodeUtils.prepareRendererAll(facesContext, child);
RenderUtils.encode(facesContext, child);
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeRenderer.java?rev=1730041&r1=1730040&r2=1730041&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeRenderer.java Fri Feb 12 15:09:26 2016
@@ -33,7 +33,6 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
-import org.apache.myfaces.tobago.renderkit.util.EncodeUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -124,7 +123,6 @@ public class TreeRenderer extends Render
}
for (final UIComponent child : tree.getChildren()) {
- EncodeUtils.prepareRendererAll(facesContext, child);
RenderUtils.encode(facesContext, child);
}
}
@@ -158,9 +156,4 @@ public class TreeRenderer extends Render
writer.endElement(HtmlElements.DIV);
}
-
- @Override
- public boolean getPrepareRendersChildren() {
- return true;
- }
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java?rev=1730041&r1=1730040&r2=1730041&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java Fri Feb 12 15:09:26 2016
@@ -370,7 +370,10 @@ public class FacesConfigGenerator extend
elementType.setText(rendererType);
element.addContent(elementType);
final org.jdom.Element elementClass = new org.jdom.Element(RENDERER_CLASS, namespace);
- final String className = "org.apache.myfaces.tobago.renderkit." + rendererType + "Renderer";
+// final String className = "org.apache.myfaces.tobago.renderkit." + rendererType + "Renderer";
+ // TBD: support different Renderer Classes per Theme any longer? Or how?
+ final String className
+ = "org.apache.myfaces.tobago.renderkit.html.standard.standard.tag." + rendererType + "Renderer";
elementClass.setText(className);
element.addContent(elementClass);
renderer.add(element);