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 2010/04/26 15:12:20 UTC
svn commit: r938032 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/component/
core/src/main/java/org/apache/myfaces/tobago/internal/component/
core/src/main/java/org/apache/myfaces/tobago/internal/taglib/
core/src/main/java/or...
Author: lofwyr
Date: Mon Apr 26 13:12:20 2010
New Revision: 938032
URL: http://svn.apache.org/viewvc?rev=938032&view=rev
Log:
TOBAGO-810, TOBAGO-665
- add additional parameter UIComponent parent to the interfaces OnComponentCreated and OnComponentPopulated
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/CreateComponentUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIDatePicker.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMenuBar.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanel.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIWizard.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/OnComponentCreated.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/OnComponentPopulated.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/CreateComponentUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/CreateComponentUtils.java?rev=938032&r1=938031&r2=938032&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/CreateComponentUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/CreateComponentUtils.java Mon Apr 26 13:12:20 2010
@@ -141,15 +141,16 @@ public class CreateComponentUtils {
return checkbox;
}
- public static LayoutManager createAndInitLayout(FacesContext facesContext, String componentType,
- String rendererType) {
+ public static LayoutManager createAndInitLayout(
+ FacesContext facesContext, String componentType, String rendererType, UIComponent parent) {
+
LayoutManager layoutManager = (LayoutManager) CreateComponentUtils.createComponent(
facesContext, componentType, rendererType, facesContext.getViewRoot().createUniqueId());
if (layoutManager instanceof OnComponentCreated) {
- ((OnComponentCreated) layoutManager).onComponentCreated(facesContext);
+ ((OnComponentCreated) layoutManager).onComponentCreated(facesContext, parent);
}
if (layoutManager instanceof OnComponentPopulated) {
- ((OnComponentPopulated) layoutManager).onComponentPopulated(facesContext);
+ ((OnComponentPopulated) layoutManager).onComponentPopulated(facesContext, parent);
}
return layoutManager;
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIDatePicker.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIDatePicker.java?rev=938032&r1=938031&r2=938032&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIDatePicker.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIDatePicker.java Mon Apr 26 13:12:20 2010
@@ -92,10 +92,10 @@ public class UIDatePicker extends UILink
super.broadcast(facesEvent);
}
- public void onComponentCreated(FacesContext context) {
+ public void onComponentCreated(FacesContext context, UIComponent parent) {
Renderer renderer = getRenderer(getFacesContext());
if (renderer instanceof RendererBase) {
- ((RendererBase) renderer).onComponentCreated(context, this);
+ ((RendererBase) renderer).onComponentCreated(context, this, parent);
}
}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMenuBar.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMenuBar.java?rev=938032&r1=938031&r2=938032&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMenuBar.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMenuBar.java Mon Apr 26 13:12:20 2010
@@ -22,6 +22,7 @@ import org.apache.myfaces.tobago.config.
import org.apache.myfaces.tobago.context.Markup;
import org.apache.myfaces.tobago.renderkit.RendererBase;
+import javax.faces.component.UIComponent;
import javax.faces.component.UIPanel;
import javax.faces.context.FacesContext;
import javax.faces.render.Renderer;
@@ -33,10 +34,10 @@ public abstract class AbstractUIMenuBar
return null;
}
- public void onComponentCreated(FacesContext context) {
+ public void onComponentCreated(FacesContext context, UIComponent parent) {
Renderer renderer = getRenderer(getFacesContext());
if (renderer instanceof RendererBase) {
- ((RendererBase) renderer).onComponentCreated(context, this);
+ ((RendererBase) renderer).onComponentCreated(context, this, parent);
}
}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java?rev=938032&r1=938031&r2=938032&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java Mon Apr 26 13:12:20 2010
@@ -298,10 +298,10 @@ public abstract class AbstractUIPage ext
return FacesUtils.invokeOnComponent(context, this, clientId, callback);
}
- public void onComponentPopulated(FacesContext facesContext) {
+ public void onComponentPopulated(FacesContext facesContext, UIComponent parent) {
if (getLayoutManager() == null) {
setLayoutManager(CreateComponentUtils.createAndInitLayout(
- facesContext, ComponentTypes.GRID_LAYOUT, RendererTypes.GRID_LAYOUT));
+ facesContext, ComponentTypes.GRID_LAYOUT, RendererTypes.GRID_LAYOUT, parent));
}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanel.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanel.java?rev=938032&r1=938031&r2=938032&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanel.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanel.java Mon Apr 26 13:12:20 2010
@@ -29,6 +29,7 @@ import org.apache.myfaces.tobago.layout.
import org.apache.myfaces.tobago.layout.LayoutContainer;
import org.apache.myfaces.tobago.layout.LayoutManager;
+import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import java.io.IOException;
import java.util.List;
@@ -58,10 +59,10 @@ public abstract class AbstractUIPanel ex
super.encodeEnd(facesContext);
}
- public void onComponentPopulated(FacesContext facesContext) {
+ public void onComponentPopulated(FacesContext facesContext, UIComponent parent) {
if (getLayoutManager() == null) {
setLayoutManager(CreateComponentUtils.createAndInitLayout(
- facesContext, ComponentTypes.GRID_LAYOUT, RendererTypes.GRID_LAYOUT));
+ facesContext, ComponentTypes.GRID_LAYOUT, RendererTypes.GRID_LAYOUT, parent));
}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java?rev=938032&r1=938031&r2=938032&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java Mon Apr 26 13:12:20 2010
@@ -57,7 +57,7 @@ public abstract class AbstractUIPopup ex
private boolean activated;
- public void onComponentCreated(FacesContext facesContext) {
+ public void onComponentCreated(FacesContext facesContext, UIComponent parent) {
Integer zIndex = (Integer) facesContext.getExternalContext().getRequestMap().get(Z_INDEX);
if (zIndex == null) {
zIndex = 1;
@@ -68,10 +68,10 @@ public abstract class AbstractUIPopup ex
facesContext.getExternalContext().getRequestMap().put(Z_INDEX, zIndex);
}
- public void onComponentPopulated(FacesContext facesContext) {
+ public void onComponentPopulated(FacesContext facesContext, UIComponent parent) {
if (getLayoutManager() == null) {
setLayoutManager(CreateComponentUtils.createAndInitLayout(
- facesContext, ComponentTypes.GRID_LAYOUT, RendererTypes.GRID_LAYOUT));
+ facesContext, ComponentTypes.GRID_LAYOUT, RendererTypes.GRID_LAYOUT, parent));
}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.java?rev=938032&r1=938031&r2=938032&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.java Mon Apr 26 13:12:20 2010
@@ -22,6 +22,7 @@ import org.apache.commons.logging.LogFac
import org.apache.myfaces.tobago.component.OnComponentPopulated;
import org.apache.myfaces.tobago.util.ComponentUtils;
+import javax.faces.component.UIComponent;
import javax.faces.component.UISelectItem;
import javax.faces.context.FacesContext;
@@ -31,10 +32,10 @@ public class AbstractUISelectItem extend
private boolean itemValueLiteral;
- public void onComponentPopulated(FacesContext facesContext) {
+ public void onComponentPopulated(FacesContext facesContext, UIComponent parent) {
if (itemValueLiteral) {
Object converted = ComponentUtils.getConvertedValue(
- FacesContext.getCurrentInstance(), (javax.faces.component.UIInput) getParent(), (String)getItemValue());
+ FacesContext.getCurrentInstance(), (javax.faces.component.UIInput) parent, (String)getItemValue());
super.setItemValue(converted);
}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java?rev=938032&r1=938031&r2=938032&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java Mon Apr 26 13:12:20 2010
@@ -516,10 +516,10 @@ public abstract class AbstractUISheet ex
return LayoutUtils.findLayoutChildren(this);
}
- public void onComponentPopulated(FacesContext facesContext) {
+ public void onComponentPopulated(FacesContext facesContext, UIComponent parent) {
if (getLayoutManager() == null) {
setLayoutManager(CreateComponentUtils.createAndInitLayout(
- facesContext, ComponentTypes.SHEET_LAYOUT, RendererTypes.SHEET_LAYOUT));
+ facesContext, ComponentTypes.SHEET_LAYOUT, RendererTypes.SHEET_LAYOUT, parent));
}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java?rev=938032&r1=938031&r2=938032&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java Mon Apr 26 13:12:20 2010
@@ -314,10 +314,10 @@ public abstract class AbstractUITabGroup
return LayoutUtils.findLayoutChildren(this);
}
- public void onComponentPopulated(FacesContext facesContext) {
+ public void onComponentPopulated(FacesContext facesContext, UIComponent parent) {
if (getLayoutManager() == null) {
setLayoutManager(CreateComponentUtils.createAndInitLayout(
- facesContext, ComponentTypes.TAB_GROUP_LAYOUT, RendererTypes.TAB_GROUP_LAYOUT));
+ facesContext, ComponentTypes.TAB_GROUP_LAYOUT, RendererTypes.TAB_GROUP_LAYOUT, parent));
}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIWizard.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIWizard.java?rev=938032&r1=938031&r2=938032&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIWizard.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIWizard.java Mon Apr 26 13:12:20 2010
@@ -21,6 +21,7 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.event.FacesEventWrapper;
import org.apache.myfaces.tobago.model.Wizard;
+import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
import javax.faces.event.AbortProcessingException;
@@ -94,7 +95,7 @@ public abstract class AbstractUIWizard e
}
}
- public void onComponentCreated(FacesContext context) {
+ public void onComponentCreated(FacesContext context, UIComponent parent) {
Wizard wizard = getController();
wizard.register();
if (getOutcome() != null) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java?rev=938032&r1=938031&r2=938032&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java Mon Apr 26 13:12:20 2010
@@ -38,7 +38,7 @@ public abstract class TobagoTag extends
if (component instanceof OnComponentCreated
&& component.getAttributes().get(OnComponentCreated.MARKER) == null) {
component.getAttributes().put(OnComponentCreated.MARKER, Boolean.TRUE);
- ((OnComponentCreated) component).onComponentCreated(getFacesContext());
+ ((OnComponentCreated) component).onComponentCreated(getFacesContext(), component.getParent());
}
return result;
}
@@ -68,7 +68,7 @@ public abstract class TobagoTag extends
&& component.getAttributes().get(OnComponentPopulated.MARKER) == null) {
component.getAttributes().put(OnComponentPopulated.MARKER, Boolean.TRUE);
FacesContext facesContext = FacesContext.getCurrentInstance();
- ((OnComponentPopulated) component).onComponentPopulated(facesContext);
+ ((OnComponentPopulated) component).onComponentPopulated(facesContext, component.getParent());
}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java?rev=938032&r1=938031&r2=938032&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java Mon Apr 26 13:12:20 2010
@@ -34,8 +34,8 @@ public abstract class AbstractRendererBa
private static final Log LOG = LogFactory.getLog(AbstractRendererBaseWrapper.class);
@Override
- public final void onComponentCreated(FacesContext context, UIComponent component) {
- getRenderer(context).onComponentCreated(context, component);
+ public final void onComponentCreated(FacesContext facesContext, UIComponent component, UIComponent parent) {
+ getRenderer(facesContext).onComponentCreated(facesContext, component, parent);
}
@Override
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java?rev=938032&r1=938031&r2=938032&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java Mon Apr 26 13:12:20 2010
@@ -175,8 +175,8 @@ public class RendererBase extends Render
return converter;
}
- public Object getConvertedValue(FacesContext context,
- UIComponent component, Object submittedValue)
+ @Override
+ public Object getConvertedValue(FacesContext context, UIComponent component, Object submittedValue)
throws ConverterException {
if (!(submittedValue instanceof String)) {
return submittedValue;
@@ -189,8 +189,7 @@ public class RendererBase extends Render
}
}
- public void onComponentCreated(FacesContext context, UIComponent component) {
-
+ public void onComponentCreated(FacesContext facesContext, UIComponent component, UIComponent parent) {
}
protected synchronized ResourceManager getResourceManager() {
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java?rev=938032&r1=938031&r2=938032&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java Mon Apr 26 13:12:20 2010
@@ -73,7 +73,7 @@ public class TobagoComponentHandler exte
if (component instanceof OnComponentCreated
&& component.getAttributes().get(OnComponentCreated.MARKER) == null) {
component.getAttributes().put(OnComponentCreated.MARKER, Boolean.TRUE);
- ((OnComponentCreated) component).onComponentCreated(context.getFacesContext());
+ ((OnComponentCreated) component).onComponentCreated(context.getFacesContext(), parent);
}
}
@@ -81,7 +81,7 @@ public class TobagoComponentHandler exte
if (component instanceof OnComponentPopulated
&& component.getAttributes().get(OnComponentPopulated.MARKER) == null) {
component.getAttributes().put(OnComponentPopulated.MARKER, Boolean.TRUE);
- ((OnComponentPopulated) component).onComponentPopulated(context.getFacesContext());
+ ((OnComponentPopulated) component).onComponentPopulated(context.getFacesContext(), parent);
}
}
}
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java?rev=938032&r1=938031&r2=938032&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java Mon Apr 26 13:12:20 2010
@@ -53,7 +53,7 @@ public class DateExtensionHandler extend
picker.setId(root.createUniqueId());
if (picker.getAttributes().get(OnComponentCreated.MARKER) == null) {
picker.getAttributes().put(OnComponentCreated.MARKER, Boolean.TRUE);
- picker.onComponentCreated(faceletContext.getFacesContext());
+ picker.onComponentCreated(faceletContext.getFacesContext(), panel);
}
panel.getChildren().add(picker);
}
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java?rev=938032&r1=938031&r2=938032&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java Mon Apr 26 13:12:20 2010
@@ -202,11 +202,11 @@ public abstract class TobagoLabelExtensi
gridLayout.setRows(getRows());
gridLayout.setId(root.createUniqueId());
if (gridLayout instanceof OnComponentCreated) {
- ((OnComponentCreated) gridLayout).onComponentCreated(faceletContext.getFacesContext());
+ ((OnComponentCreated) gridLayout).onComponentCreated(faceletContext.getFacesContext(), panel);
}
panel.getFacets().put(Facets.LAYOUT, gridLayout);
if (gridLayout instanceof OnComponentPopulated) {
- ((OnComponentPopulated) gridLayout).onComponentPopulated(faceletContext.getFacesContext());
+ ((OnComponentPopulated) gridLayout).onComponentPopulated(faceletContext.getFacesContext(), panel);
}
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java?rev=938032&r1=938031&r2=938032&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java Mon Apr 26 13:12:20 2010
@@ -55,11 +55,8 @@ public class DatePickerRenderer extends
private static final Log LOG = LogFactory.getLog(DatePickerRenderer.class);
@Override
- public void onComponentCreated(FacesContext context, UIComponent component) {
- preparePicker(context, (UIDatePicker) component);
- }
-
- public void preparePicker(FacesContext facesContext, UIDatePicker picker) {
+ public void onComponentCreated(FacesContext facesContext, UIComponent component, UIComponent parent) {
+ final UIDatePicker picker = (UIDatePicker) component;
if (picker.getFor() == null) {
picker.setFor("@auto");
}
@@ -73,7 +70,7 @@ public class DatePickerRenderer extends
popup.getAttributes().put(Attributes.Z_INDEX, 10);
picker.getFacets().put(Facets.PICKER_POPUP, popup);
popup.setRendered(false);
- popup.onComponentPopulated(facesContext);
+ popup.onComponentPopulated(facesContext, parent);
final UIBox box = (UIBox) CreateComponentUtils.createComponent(
facesContext, UIBox.COMPONENT_TYPE, RendererTypes.BOX, "box");
@@ -99,7 +96,7 @@ public class DatePickerRenderer extends
layoutOfTime.setColumns("1*;fixed;1*");
final UIPanel cell1 = (UIPanel) CreateComponentUtils.createComponent(
facesContext, UIPanel.COMPONENT_TYPE, RendererTypes.PANEL, "cell1");
- cell1.onComponentPopulated(facesContext);
+ cell1.onComponentPopulated(facesContext, parent);
timePanel.getChildren().add(cell1);
final UITime time = (UITime) CreateComponentUtils.createComponent(
@@ -108,10 +105,10 @@ public class DatePickerRenderer extends
final UIPanel cell2 = (UIPanel) CreateComponentUtils.createComponent(
facesContext, UIPanel.COMPONENT_TYPE, RendererTypes.PANEL, "cell2");
- cell2.onComponentPopulated(facesContext);
+ cell2.onComponentPopulated(facesContext, parent);
timePanel.getChildren().add(cell2);
- timePanel.onComponentPopulated(facesContext);
+ timePanel.onComponentPopulated(facesContext, parent);
final UIPanel buttonPanel = (UIPanel) CreateComponentUtils.createComponent(
@@ -123,7 +120,7 @@ public class DatePickerRenderer extends
layoutOfButtons.setRows("fixed");
box.getChildren().add(buttonPanel);
- box.onComponentPopulated(facesContext);
+ box.onComponentPopulated(facesContext, parent);
final UIButton okButton = (UIButton) CreateComponentUtils.createComponent(
facesContext, UIButton.COMPONENT_TYPE, RendererTypes.BUTTON, "ok");
@@ -139,7 +136,7 @@ public class DatePickerRenderer extends
cancelButton.setOnclick("writeIntoField2(this);");
cancelButton.getAttributes().put(Attributes.POPUP_CLOSE, "immediate");
- buttonPanel.onComponentPopulated(facesContext);
+ buttonPanel.onComponentPopulated(facesContext, parent);
// create image
// check the id: its might be better not calling createUniqueId
Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java?rev=938032&r1=938031&r2=938032&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java Mon Apr 26 13:12:20 2010
@@ -35,7 +35,7 @@ public abstract class TobagoELTag extend
if (component instanceof OnComponentCreated
&& component.getAttributes().get(OnComponentCreated.MARKER) == null) {
component.getAttributes().put(OnComponentCreated.MARKER, Boolean.TRUE);
- ((OnComponentCreated) component).onComponentCreated(getFacesContext());
+ ((OnComponentCreated) component).onComponentCreated(getFacesContext(), component.getParent());
}
return result;
}
@@ -45,9 +45,9 @@ public abstract class TobagoELTag extend
UIComponent component = getComponentInstance();
int result = super.doEndTag();
if (component instanceof OnComponentPopulated
- && component.getAttributes().get(OnComponentCreated.MARKER) == null) {
+ && component.getAttributes().get(OnComponentPopulated.MARKER) == null) {
component.getAttributes().put(OnComponentPopulated.MARKER, Boolean.TRUE);
- ((OnComponentPopulated) component).onComponentPopulated(getFacesContext());
+ ((OnComponentPopulated) component).onComponentPopulated(getFacesContext(), component.getParent());
}
return result;
}
Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/OnComponentCreated.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/OnComponentCreated.java?rev=938032&r1=938031&r2=938032&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/OnComponentCreated.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/OnComponentCreated.java Mon Apr 26 13:12:20 2010
@@ -17,11 +17,12 @@ package org.apache.myfaces.tobago.compon
* limitations under the License.
*/
+import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
public interface OnComponentCreated {
String MARKER = "org.apache.myfaces.tobago.OnComponentCreated.MARKER";
- void onComponentCreated(FacesContext facesContext);
+ void onComponentCreated(FacesContext facesContext, UIComponent parent);
}
Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/OnComponentPopulated.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/OnComponentPopulated.java?rev=938032&r1=938031&r2=938032&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/OnComponentPopulated.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/component/OnComponentPopulated.java Mon Apr 26 13:12:20 2010
@@ -17,11 +17,12 @@ package org.apache.myfaces.tobago.compon
* limitations under the License.
*/
+import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
public interface OnComponentPopulated {
String MARKER = "org.apache.myfaces.tobago.component.OnComponentPopulated.MARKER";
- void onComponentPopulated(FacesContext facesContext);
+ void onComponentPopulated(FacesContext facesContext, UIComponent parent);
}