[richfaces-svn-commits] JBoss Rich Faces SVN: r3890 - in trunk/ui: datascroller/src/main/java/org/richfaces/component and 6 other directories.

Author: nbelaevski Date: 2007-11-09 21:10:07 -0500 (Fri, 09 Nov 2007) New Revision: 3890 Modified: trunk/ui/dataFilterSlider/src/main/java/org/richfaces/component/UIDataFltrSlider.java trunk/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java trunk/ui/effect/src/main/java/org/richfaces/component/UIEffect.java trunk/ui/effect/src/main/java/org/richfaces/renderkit/EffectRendererBase.java trunk/ui/togglePanel/src/main/java/org/richfaces/component/UIToggleControl.java trunk/ui/togglePanel/src/main/java/org/richfaces/renderkit/html/ToggleControlRenderer.java trunk/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java Log: http://jira.jboss.com/jira/browse/RF-1325 Modified: trunk/ui/dataFilterSlider/src/main/java/org/richfaces/component/UIDataFltrSlider.java =================================================================== --- trunk/ui/dataFilterSlider/src/main/java/org/richfaces/component/UIDataFltrSlider.java 2007-11-10 02:07:29 UTC (rev 3889) +++ trunk/ui/dataFilterSlider/src/main/java/org/richfaces/component/UIDataFltrSlider.java 2007-11-10 02:10:07 UTC (rev 3890) @@ -35,6 +35,7 @@ import javax.faces.event.FacesEvent; import javax.faces.model.ListDataModel; +import org.ajax4jsf.renderkit.RendererUtils; import org.richfaces.event.DataFilterSliderAdapter; import org.richfaces.event.DataFilterSliderEvent; import org.richfaces.event.DataFilterSliderListener; @@ -139,7 +140,7 @@ // DataScroller may be a child of uiData forComp = getParent(); } else { - forComp = findComponent(forAttribute); + forComp = RendererUtils.getInstance().findComponentFor(getFacesContext(), this, forAttribute); } if (forComp == null) { throw new IllegalArgumentException("could not find dataTable with id '" Modified: trunk/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java =================================================================== --- trunk/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java 2007-11-10 02:07:29 UTC (rev 3889) +++ trunk/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java 2007-11-10 02:10:07 UTC (rev 3890) @@ -21,12 +21,6 @@ package org.richfaces.component; -import org.ajax4jsf.component.AjaxActionComponent; -import org.ajax4jsf.renderkit.AjaxRendererUtils; -import org.richfaces.event.DataScrollerEvent; -import org.richfaces.event.DataScrollerListener; -import org.richfaces.event.DataScrollerSource; - import javax.el.MethodExpression; import javax.faces.FacesException; import javax.faces.component.ActionSource; @@ -36,7 +30,14 @@ import javax.faces.event.AbortProcessingException; import javax.faces.event.FacesEvent; +import org.ajax4jsf.component.AjaxActionComponent; +import org.ajax4jsf.renderkit.AjaxRendererUtils; +import org.ajax4jsf.renderkit.RendererUtils; +import org.richfaces.event.DataScrollerEvent; +import org.richfaces.event.DataScrollerListener; +import org.richfaces.event.DataScrollerSource; + /** JSF component class */ //xxxx nick -> alex - extend UIComponentBase and //create event listener & event classes to define PageSwitchEvent @@ -201,7 +202,7 @@ throw new FacesException( "could not find dataTable for datascroller " + this.getId()); } else { - forComp = findComponent(forAttribute); + forComp = RendererUtils.getInstance().findComponentFor(getFacesContext(), this, forAttribute); } if (forComp == null) { throw new IllegalArgumentException("could not find dataTable with id '" Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java 2007-11-10 02:07:29 UTC (rev 3889) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java 2007-11-10 02:10:07 UTC (rev 3890) @@ -31,6 +31,7 @@ import org.ajax4jsf.javascript.DnDScript; import org.ajax4jsf.javascript.PrototypeScript; import org.ajax4jsf.renderkit.AjaxRendererUtils; +import org.ajax4jsf.renderkit.RendererUtils; import org.richfaces.component.Draggable; import org.richfaces.component.Dropzone; import org.richfaces.event.DragEvent; @@ -143,7 +144,7 @@ if (indicatorId == null) { String simpleId = draggable.getDragIndicator(); if (simpleId != null) { - UIComponent indicator = component.findComponent(simpleId); + UIComponent indicator = RendererUtils.getInstance().findComponentFor(context, component, simpleId); if (indicator != null) { indicatorId = indicator.getClientId(context); } Modified: trunk/ui/effect/src/main/java/org/richfaces/component/UIEffect.java =================================================================== --- trunk/ui/effect/src/main/java/org/richfaces/component/UIEffect.java 2007-11-10 02:07:29 UTC (rev 3889) +++ trunk/ui/effect/src/main/java/org/richfaces/component/UIEffect.java 2007-11-10 02:10:07 UTC (rev 3890) @@ -46,8 +46,6 @@ private static final Log log = LogFactory.getLog(UIEffect.class); - private static RendererUtils rendererUtils = new RendererUtils(); - /** * @return JavaScript eventString. Rebuild on every call, since * can be in loop ( as in dataTable ) with different parameters. @@ -61,7 +59,7 @@ UIComponent targetComponent=null; if (!"".equals(targetId)) { - targetComponent=rendererUtils.findComponentFor(FacesContext.getCurrentInstance(),this,targetId); + targetComponent=RendererUtils.getInstance().findComponentFor(FacesContext.getCurrentInstance(),this,targetId); } if (targetComponent!=null) { targetPart = "{targetId:'"+targetComponent.getClientId(FacesContext.getCurrentInstance())+"'}"; Modified: trunk/ui/effect/src/main/java/org/richfaces/renderkit/EffectRendererBase.java =================================================================== --- trunk/ui/effect/src/main/java/org/richfaces/renderkit/EffectRendererBase.java 2007-11-10 02:07:29 UTC (rev 3889) +++ trunk/ui/effect/src/main/java/org/richfaces/renderkit/EffectRendererBase.java 2007-11-10 02:10:07 UTC (rev 3890) @@ -11,6 +11,7 @@ import org.ajax4jsf.javascript.JSEncoder; import org.ajax4jsf.renderkit.HeaderResourcesRendererBase; +import org.ajax4jsf.renderkit.RendererUtils; import org.richfaces.component.UIEffect; import org.richfaces.json.JSONTokener; @@ -98,7 +99,7 @@ if ("id".equals(key)) { Object value = x.nextValue(); - UIComponent component = effect.findComponent(value.toString()); + UIComponent component = RendererUtils.getInstance().findComponentFor(context, effect, value.toString()); if (component != null) { value = component.getClientId(context); } Modified: trunk/ui/togglePanel/src/main/java/org/richfaces/component/UIToggleControl.java =================================================================== --- trunk/ui/togglePanel/src/main/java/org/richfaces/component/UIToggleControl.java 2007-11-10 02:07:29 UTC (rev 3889) +++ trunk/ui/togglePanel/src/main/java/org/richfaces/component/UIToggleControl.java 2007-11-10 02:10:07 UTC (rev 3890) @@ -82,7 +82,7 @@ if (null != target) { - UIComponent targetComponent = control.findComponent(target); + UIComponent targetComponent = RendererUtils.getInstance().findComponentFor(FacesContext.getCurrentInstance(), control, target); if (null != targetComponent) { return (UITogglePanel)targetComponent; } else { @@ -145,7 +145,7 @@ } else { //xxxx by nick - nick - potential compatibility break? - panel = this.findComponent(panelId); + panel = RendererUtils.getInstance().findComponentFor(context, this, panelId); if(panel == null) { //xxx by nick - denis - please replace all RuntimeException with more concrete FacesException throw new FacesException("Panel with id=" + panelId + " has not been found."); Modified: trunk/ui/togglePanel/src/main/java/org/richfaces/renderkit/html/ToggleControlRenderer.java =================================================================== --- trunk/ui/togglePanel/src/main/java/org/richfaces/renderkit/html/ToggleControlRenderer.java 2007-11-10 02:07:29 UTC (rev 3889) +++ trunk/ui/togglePanel/src/main/java/org/richfaces/renderkit/html/ToggleControlRenderer.java 2007-11-10 02:10:07 UTC (rev 3890) @@ -131,8 +131,7 @@ } else { // Server //xxx by nick - denis - use org.ajax4jsf.renderkit.RendererUtils#getNestingForm(FacesContext, UIComponent) - RendererUtils rendererUtils = new RendererUtils(); - UIForm Form= rendererUtils.getNestingForm(context, component); + UIForm Form= getUtils().getNestingForm(context, component); String formId=null; if (Form!=null){ formId = Form.getClientId(context); Modified: trunk/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java =================================================================== --- trunk/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java 2007-11-10 02:07:29 UTC (rev 3889) +++ trunk/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java 2007-11-10 02:10:07 UTC (rev 3890) @@ -211,7 +211,7 @@ String forValue = toolTip.getFor(); if (forValue != null && forValue.length() != 0) { - UIComponent targetComponent = component.findComponent(forValue); + UIComponent targetComponent = getUtils().findComponentFor(context, component, forValue); if (targetComponent != null) { return targetComponent.getClientId(context); } else {