svn commit: r831383 [1/2] - in /myfaces/tobago/trunk: core/src/main/java/org/apache/myfaces/tobago/ajax/api/ core/src/main/java/org/apache/myfaces/tobago/component/ core/src/main/java/org/apache/myfaces/tobago/config/ core/src/main/java/org/apache/myfa...

[lo...@apache.org]

Author: lofwyr
Date: Fri Oct 30 16:51:31 2009
New Revision: 831383

URL: http://svn.apache.org/viewvc?rev=831383&view=rev
Log:
TOBAGO-412: rename ComponentUtil to ComponentUtils

Modified:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxResponseRenderer.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIData.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIForm.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPage.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPopup.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITree.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIInputBase.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIPanelBase.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/event/PopupActionListener.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ApplyRequestValuesExecutor.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/RestoreViewExecutor.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/CommandRendererBase.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/InputRendererBase.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectOneRendererBase.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SheetUtils.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/AttributeTag.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ScriptTag.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/StyleTag.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/EncodeAjaxCallback.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ProcessValidationsCallback.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/UpdateModelValuesCallback.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/validator/ClearValidatorsActionListener.java
    myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/ComponentUtilUnitTest.java
    myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java
    myfaces/tobago/trunk/example/demo/src/main/resources/log4j.xml
    myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java
    myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java
    myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/InputNumberSliderRenderer.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/InRenderer.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectBooleanCheckboxRenderer.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectOneChoiceRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/tag/MessageRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FormRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessageRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/VerbatimRenderer.java
    myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java
    myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java
    myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtil.java

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxResponseRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxResponseRenderer.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxResponseRenderer.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxResponseRenderer.java Fri Oct 30 16:51:31 2009
@@ -24,7 +24,7 @@
 import org.apache.myfaces.tobago.context.TobagoFacesContext;
 import static org.apache.myfaces.tobago.lifecycle.TobagoLifecycle.FACES_MESSAGES_KEY;
 import static org.apache.myfaces.tobago.lifecycle.TobagoLifecycle.VIEW_ROOT_KEY;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.util.EncodeAjaxCallback;
 import org.apache.myfaces.tobago.util.RequestUtils;
 import org.apache.myfaces.tobago.util.ResponseUtils;
@@ -162,7 +162,7 @@
 
     RequestUtils.ensureEncoding(facesContext);
     ResponseUtils.ensureNoCacheHeader(facesContext);
-    UIComponent page = ComponentUtil.findPage(facesContext);
+    UIComponent page = ComponentUtils.findPage(facesContext);
     String charset;
     if (page != null) {  // in case of CODE_RELOAD_REQUIRED page is null
       charset = (String) page.getAttributes().get(Attributes.CHARSET);

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java Fri Oct 30 16:51:31 2009
@@ -21,14 +21,14 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.StringTokenizer;
-import java.util.HashMap;
 
 public class AjaxUtils {
 
@@ -62,7 +62,7 @@
     if (!component.isRendered()) {
       return;
     }
-    Object renderer = ComponentUtil.getRenderer(facesContext, component);
+    Object renderer = ComponentUtils.getRenderer(facesContext, component);
     if (renderer != null && renderer instanceof AjaxRenderer) {
       ((AjaxRenderer) renderer).encodeAjax(facesContext, component);
     }

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIData.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIData.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIData.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIData.java Fri Oct 30 16:51:31 2009
@@ -36,7 +36,7 @@
 import org.apache.myfaces.tobago.layout.LayoutTokens;
 import org.apache.myfaces.tobago.layout.LayoutUtils;
 import org.apache.myfaces.tobago.model.SheetState;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.faces.FacesException;
 import javax.faces.component.ContextCallback;
@@ -355,7 +355,7 @@
       final String ajaxId = ((TobagoFacesContext) context).getAjaxComponentId();
       UIComponent reload = getFacet(Facets.RELOAD);
       if (ajaxId != null && ajaxId.equals(getClientId(context)) && reload != null && reload.isRendered()
-          && ajaxId.equals(ComponentUtil.findPage(context, this).getActionId())) {
+          && ajaxId.equals(ComponentUtils.findPage(context, this).getActionId())) {
         Boolean immediate = (Boolean) reload.getAttributes().get(Attributes.IMMEDIATE);
         if (immediate != null && immediate) {
           Boolean update = (Boolean) reload.getAttributes().get(Attributes.UPDATE);
@@ -375,7 +375,7 @@
 
   public void encodeAjax(FacesContext facesContext) throws IOException {
     // TODO neets more testing!!!
-    //if (!facesContext.getRenderResponse() && !ComponentUtil.hasErrorMessages(facesContext)) {
+    //if (!facesContext.getRenderResponse() && !ComponentUtils.hasErrorMessages(facesContext)) {
     // in encodeBegin of superclass is some logic which clears the DataModel
     // this must here also done.
     // in RI and myfaces this could done via setValue(null)

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIForm.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIForm.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIForm.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIForm.java Fri Oct 30 16:51:31 2009
@@ -21,13 +21,13 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.tobago.compat.FacesUtils;
 import org.apache.myfaces.tobago.compat.InvokeOnComponent;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.util.TobagoCallback;
-import org.apache.myfaces.tobago.util.ComponentUtil;
 
-import javax.faces.component.UIComponent;
+import javax.faces.FacesException;
 import javax.faces.component.ContextCallback;
+import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
-import javax.faces.FacesException;
 import javax.faces.event.PhaseId;
 import java.util.Iterator;
 
@@ -56,7 +56,7 @@
     super.setSubmitted(b);
 
     // set submitted for all subforms
-    for (AbstractUIForm subForm : ComponentUtil.findSubForms(this)) {
+    for (AbstractUIForm subForm : ComponentUtils.findSubForms(this)) {
       subForm.setSubmitted(b);
     }
   }
@@ -67,7 +67,7 @@
       LOG.debug("processValidators for form: " + getClientId(facesContext));
     }
     if (!isSubmitted()) {
-      for (AbstractUIForm subForm : ComponentUtil.findSubForms(this)) {
+      for (AbstractUIForm subForm : ComponentUtils.findSubForms(this)) {
         subForm.processValidators(facesContext);
       }
     } else {
@@ -86,7 +86,7 @@
       LOG.debug("processUpdates for form: " + getClientId(facesContext));
     }
     if (!isSubmitted()) {
-      for (AbstractUIForm subForm : ComponentUtil.findSubForms(this)) {
+      for (AbstractUIForm subForm : ComponentUtils.findSubForms(this)) {
         subForm.processUpdates(facesContext);
       }
     } else {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPage.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPage.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPage.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPage.java Fri Oct 30 16:51:31 2009
@@ -20,6 +20,7 @@
 import org.apache.commons.collections.KeyValue;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import static org.apache.myfaces.tobago.TobagoConstants.SUBCOMPONENT_SEP;
 import org.apache.myfaces.tobago.compat.FacesUtils;
 import org.apache.myfaces.tobago.compat.InvokeOnComponent;
 import org.apache.myfaces.tobago.layout.Box;
@@ -30,7 +31,7 @@
 import org.apache.myfaces.tobago.layout.Measure;
 import org.apache.myfaces.tobago.model.PageState;
 import org.apache.myfaces.tobago.model.PageStateImpl;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.util.DebugUtils;
 import org.apache.myfaces.tobago.webapp.TobagoMultipartFormdataRequest;
 
@@ -47,8 +48,6 @@
 import java.util.List;
 import java.util.StringTokenizer;
 
-import static org.apache.myfaces.tobago.TobagoConstants.SUBCOMPONENT_SEP;
-
 public abstract class AbstractUIPage extends AbstractUIForm 
     implements OnComponentPopulated, InvokeOnComponent, LayoutContainer, DeprecatedDimension {
 
@@ -183,7 +182,7 @@
     }
 
     if (command != null) {
-      AbstractUIForm form = ComponentUtil.findForm(command);
+      AbstractUIForm form = ComponentUtils.findForm(command);
       form.setSubmitted(true);
 
       if (LOG.isTraceEnabled()) {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPopup.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPopup.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPopup.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPopup.java Fri Oct 30 16:51:31 2009
@@ -21,7 +21,7 @@
 import org.apache.myfaces.tobago.compat.FacesUtils;
 import org.apache.myfaces.tobago.compat.InvokeOnComponent;
 import org.apache.myfaces.tobago.layout.Measure;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.faces.FacesException;
 import javax.faces.component.ContextCallback;
@@ -66,13 +66,13 @@
   }
 
   private boolean isSubmitted() {
-    String action = ComponentUtil.findPage(getFacesContext(), this).getActionId();
+    String action = ComponentUtils.findPage(getFacesContext(), this).getActionId();
     return action != null && action.startsWith(getClientId(getFacesContext()) + SEPARATOR_CHAR);
   }
 
   private boolean isRedisplay() {
     if (isSubmitted()) {
-      AbstractUIPage page = ComponentUtil.findPage(getFacesContext(), this);
+      AbstractUIPage page = ComponentUtils.findPage(getFacesContext(), this);
       String action = page.getActionId();
       if (action != null) {
         UIComponent command = page.findComponent(SEPARATOR_CHAR + action);

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITree.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITree.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITree.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITree.java Fri Oct 30 16:51:31 2009
@@ -19,7 +19,7 @@
 
 import org.apache.myfaces.tobago.layout.LayoutComponent;
 import org.apache.myfaces.tobago.model.MixedTreeModel;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.faces.application.FacesMessage;
 import javax.faces.component.NamingContainer;
@@ -81,7 +81,7 @@
 
   public boolean isSelectableTree() {
     final Object selectable
-        = ComponentUtil.getAttribute(this, Attributes.SELECTABLE);
+        = ComponentUtils.getAttribute(this, Attributes.SELECTABLE);
     return selectable != null
         && (selectable.equals("multi") || selectable.equals("multiLeafOnly")
         || selectable.equals("single") || selectable.equals("singleLeafOnly")
@@ -94,7 +94,7 @@
       return;
     }
 
-    if (ComponentUtil.isOutputOnly(this)) {
+    if (ComponentUtils.isOutputOnly(this)) {
       setValid(true);
     } else {
       // in tree first decode node and than decode children
@@ -119,7 +119,7 @@
       context.addMessage(getClientId(context), facesMessage);
     }
 
-    String selectable = ComponentUtil.getStringAttribute(this, SELECTABLE);
+    String selectable = ComponentUtils.getStringAttribute(this, SELECTABLE);
     if (selectable != null && selectable.endsWith("LeafOnly")) {
 
       Set<DefaultMutableTreeNode> selection = getState().getSelection();

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIInputBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIInputBase.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIInputBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIInputBase.java Fri Oct 30 16:51:31 2009
@@ -20,7 +20,7 @@
 import org.apache.myfaces.tobago.ajax.api.AjaxComponent;
 import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
 import org.apache.myfaces.tobago.layout.LayoutComponent;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.faces.context.FacesContext;
 import java.io.IOException;
@@ -30,7 +30,7 @@
 
   // TODO can this removed?
   public void updateModel(FacesContext facesContext) {
-    if (ComponentUtil.mayUpdateModel(this)) {
+    if (ComponentUtils.mayUpdateModel(this)) {
       super.updateModel(facesContext);
     }
   }

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIPanelBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIPanelBase.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIPanelBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIPanelBase.java Fri Oct 30 16:51:31 2009
@@ -22,7 +22,7 @@
 import org.apache.myfaces.tobago.compat.FacesUtils;
 import org.apache.myfaces.tobago.compat.InvokeOnComponent;
 import org.apache.myfaces.tobago.context.TobagoFacesContext;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.faces.FacesException;
 import javax.faces.component.ContextCallback;
@@ -40,7 +40,7 @@
       final String ajaxId = ((TobagoFacesContext) context).getAjaxComponentId();
       UIComponent reload = getFacet(Facets.RELOAD);
       if (ajaxId != null && ajaxId.equals(getClientId(context)) && reload != null && reload.isRendered()
-          && ajaxId.equals(ComponentUtil.findPage(context, this).getActionId())) {
+          && ajaxId.equals(ComponentUtils.findPage(context, this).getActionId())) {
         Boolean immediate = (Boolean) reload.getAttributes().get(Attributes.IMMEDIATE);
         if (immediate != null && immediate) {
           Boolean update = (Boolean) reload.getAttributes().get(Attributes.UPDATE);

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java Fri Oct 30 16:51:31 2009
@@ -26,12 +26,12 @@
 import org.apache.myfaces.tobago.context.ClientProperties;
 import org.apache.myfaces.tobago.context.ResourceManagerImpl;
 import org.apache.myfaces.tobago.context.TobagoFacesContext;
-import org.apache.myfaces.tobago.util.ComponentUtil;
-import org.apache.myfaces.tobago.util.TobagoCallback;
 import org.apache.myfaces.tobago.util.ApplyRequestValuesCallback;
+import org.apache.myfaces.tobago.util.ComponentUtils;
+import org.apache.myfaces.tobago.util.FacesVersion;
 import org.apache.myfaces.tobago.util.ProcessValidationsCallback;
+import org.apache.myfaces.tobago.util.TobagoCallback;
 import org.apache.myfaces.tobago.util.UpdateModelValuesCallback;
-import org.apache.myfaces.tobago.util.FacesVersion;
 
 import javax.faces.FacesException;
 import javax.faces.component.ContextCallback;
@@ -223,7 +223,7 @@
      Map<String, UIComponent> ajaxComponents = AjaxUtils.parseAndStoreComponents(context);
     if (ajaxComponents != null) {
       // first decode the page
-      AbstractUIPage page = ComponentUtil.findPage(context);
+      AbstractUIPage page = ComponentUtils.findPage(context);
       page.decode(context);
       page.markSubmittedForm(context);
       if (context instanceof TobagoFacesContext) {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java Fri Oct 30 16:51:31 2009
@@ -27,7 +27,7 @@
 import org.apache.myfaces.tobago.layout.Measure;
 import org.apache.myfaces.tobago.layout.PixelMeasure;
 import org.apache.myfaces.tobago.renderkit.RendererBase;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
@@ -103,7 +103,7 @@
       family = UIInput.COMPONENT_FAMILY;
       rendererType = RendererTypes.IN;
     }
-    Object renderer = ComponentUtil.getRenderer(facesContext, family, rendererType);
+    Object renderer = ComponentUtils.getRenderer(facesContext, family, rendererType);
 
     Class clazz = renderer.getClass();
     if (LOG.isDebugEnabled()) {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java Fri Oct 30 16:51:31 2009
@@ -19,7 +19,7 @@
 
 import org.apache.myfaces.tobago.component.AbstractUIPage;
 import org.apache.myfaces.tobago.layout.Box;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.faces.context.FacesContext;
 
@@ -30,7 +30,7 @@
 
   public Box getActionPosition() {
     FacesContext facesContext = FacesContext.getCurrentInstance();
-    AbstractUIPage page = ComponentUtil.findPage(facesContext);
+    AbstractUIPage page = ComponentUtils.findPage(facesContext);
     return page.getActionPosition();
   }
 }

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/event/PopupActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/event/PopupActionListener.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/event/PopupActionListener.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/event/PopupActionListener.java Fri Oct 30 16:51:31 2009
@@ -17,15 +17,15 @@
  * limitations under the License.
  */
 
-import org.apache.myfaces.tobago.component.AbstractUIPopup;
-import org.apache.myfaces.tobago.util.ComponentUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.tobago.component.AbstractUIPopup;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
-import javax.faces.event.ActionListener;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.AbortProcessingException;
 import javax.faces.context.FacesContext;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.ActionListener;
 import java.io.Serializable;
 
 /*
@@ -56,7 +56,7 @@
   }
 
   public void processAction(ActionEvent actionEvent) throws AbortProcessingException {
-    AbstractUIPopup popup = (AbstractUIPopup) ComponentUtil.findComponent(actionEvent.getComponent(), popupId);
+    AbstractUIPopup popup = (AbstractUIPopup) ComponentUtils.findComponent(actionEvent.getComponent(), popupId);
     if (popup != null) {
       if (LOG.isDebugEnabled()) {
         LOG.debug("activated "

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java Fri Oct 30 16:51:31 2009
@@ -27,7 +27,7 @@
 import org.apache.myfaces.tobago.event.SheetStateChangeSource;
 import org.apache.myfaces.tobago.event.SortActionSource;
 import org.apache.myfaces.tobago.event.TabChangeSource;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.faces.application.Application;
 import javax.faces.component.ActionSource;
@@ -179,7 +179,7 @@
       if (UIComponentTag.isValueReference(value)) {
         component.setValueBinding(name, createValueBinding(value));
       } else {
-        String[] components = ComponentUtil.splitList(value);
+        String[] components = ComponentUtils.splitList(value);
         try {
           PropertyUtils.setProperty(component, name, components);
         } catch (IllegalAccessException e) {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ApplyRequestValuesExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ApplyRequestValuesExecutor.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ApplyRequestValuesExecutor.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ApplyRequestValuesExecutor.java Fri Oct 30 16:51:31 2009
@@ -17,24 +17,21 @@
  * limitations under the License.
  */
 
-import static javax.faces.event.PhaseId.APPLY_REQUEST_VALUES;
-
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.compat.FacesUtils;
 import org.apache.myfaces.tobago.component.AbstractUIPage;
 import org.apache.myfaces.tobago.component.UIViewRoot;
-import org.apache.myfaces.tobago.util.ApplyRequestValuesCallback;
-import org.apache.myfaces.tobago.compat.FacesUtils;
 import org.apache.myfaces.tobago.context.TobagoFacesContext;
+import org.apache.myfaces.tobago.util.ApplyRequestValuesCallback;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.faces.component.ContextCallback;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
+import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.event.PhaseId;
-import javax.faces.component.UIComponent;
+import static javax.faces.event.PhaseId.APPLY_REQUEST_VALUES;
 import java.util.Map;
 
 /**
@@ -59,7 +56,7 @@
         = AjaxUtils.parseAndStoreComponents(facesContext);
     if (ajaxComponents != null) {
       // first decode the page
-      AbstractUIPage page = ComponentUtil.findPage(facesContext);
+      AbstractUIPage page = ComponentUtils.findPage(facesContext);
       page.decode(facesContext);
       page.markSubmittedForm(facesContext);
       if (facesContext instanceof TobagoFacesContext) {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/RestoreViewExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/RestoreViewExecutor.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/RestoreViewExecutor.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/RestoreViewExecutor.java Fri Oct 30 16:51:31 2009
@@ -22,7 +22,7 @@
 import static org.apache.myfaces.tobago.lifecycle.TobagoLifecycle.FACES_MESSAGES_KEY;
 import static org.apache.myfaces.tobago.lifecycle.TobagoLifecycle.VIEW_ROOT_KEY;
 import org.apache.myfaces.tobago.portlet.PortletUtils;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.faces.FacesException;
 import javax.faces.application.Application;
@@ -73,7 +73,7 @@
 
     if (facesContext.getViewRoot() != null) {
       facesContext.getViewRoot().setLocale(facesContext.getExternalContext().getRequestLocale());
-      ComponentUtil.resetPage(facesContext);
+      ComponentUtils.resetPage(facesContext);
       recursivelyHandleComponentReferencesAndSetValid(facesContext, facesContext.getViewRoot());
       return false;
     }
@@ -111,7 +111,7 @@
     }
 
     facesContext.setViewRoot(viewRoot);
-    ComponentUtil.resetPage(facesContext);
+    ComponentUtils.resetPage(facesContext);
 
     if (facesContext.getExternalContext().getRequestParameterMap().isEmpty()) {
       // no POST or query parameters --> set render response flag

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/CommandRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/CommandRendererBase.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/CommandRendererBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/CommandRendererBase.java Fri Oct 30 16:51:31 2009
@@ -19,8 +19,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.util.ComponentUtil;
 import org.apache.myfaces.tobago.context.ResourceManagerUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
@@ -32,10 +32,10 @@
 
   public void decode(FacesContext facesContext, UIComponent component) {
 
-    if (ComponentUtil.isOutputOnly(component)) {
+    if (ComponentUtils.isOutputOnly(component)) {
       return;
     }
-    String actionId = ComponentUtil.findPage(facesContext, component).getActionId();
+    String actionId = ComponentUtils.findPage(facesContext, component).getActionId();
     String clientId = component.getClientId(facesContext);
     if (LOG.isDebugEnabled()) {
       LOG.debug("actionId = '" + actionId + "'");

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/InputRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/InputRendererBase.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/InputRendererBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/InputRendererBase.java Fri Oct 30 16:51:31 2009
@@ -20,7 +20,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.tobago.config.ThemeConfig;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
@@ -39,7 +39,7 @@
       return; // no decoding required
     }
 
-    if (ComponentUtil.isOutputOnly(component)) {
+    if (ComponentUtils.isOutputOnly(component)) {
       return;
     }
 

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java Fri Oct 30 16:51:31 2009
@@ -19,7 +19,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.faces.FacesException;
 import javax.faces.component.UIComponent;
@@ -30,15 +30,15 @@
 import javax.faces.el.ValueBinding;
 import java.lang.reflect.Array;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Arrays;
+import java.util.List;
 
 public class SelectManyRendererBase extends LayoutableRendererBase {
 
   private static final Log LOG = LogFactory.getLog(SelectManyRendererBase.class);
 
   public void decode(FacesContext facesContext, UIComponent component) {
-    if (ComponentUtil.isOutputOnly(component)) {
+    if (ComponentUtils.isOutputOnly(component)) {
       return;
     }
     if (component instanceof UISelectMany) {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectOneRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectOneRendererBase.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectOneRendererBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectOneRendererBase.java Fri Oct 30 16:51:31 2009
@@ -19,7 +19,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UISelectOne;
@@ -30,7 +30,7 @@
   private static final Log LOG = LogFactory.getLog(SelectOneRendererBase.class);
 
   public void decode(FacesContext facesContext, UIComponent component) {
-    if (ComponentUtil.isOutputOnly(component)) {
+    if (ComponentUtils.isOutputOnly(component)) {
       return;
     }
     if (component instanceof UISelectOne) {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SheetUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SheetUtils.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SheetUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SheetUtils.java Fri Oct 30 16:51:31 2009
@@ -17,16 +17,16 @@
  * limitations under the License.
  */
 
-import org.apache.myfaces.tobago.event.PageActionEvent;
-import org.apache.myfaces.tobago.event.PageAction;
-import org.apache.myfaces.tobago.event.PageActionUtil;
-import org.apache.myfaces.tobago.util.ComponentUtil;
-import static org.apache.myfaces.tobago.TobagoConstants.SUBCOMPONENT_SEP;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import static org.apache.myfaces.tobago.TobagoConstants.SUBCOMPONENT_SEP;
+import org.apache.myfaces.tobago.event.PageAction;
+import org.apache.myfaces.tobago.event.PageActionEvent;
+import org.apache.myfaces.tobago.event.PageActionUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
-import javax.faces.context.FacesContext;
 import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
 import java.util.Map;
 
 /*
@@ -39,7 +39,7 @@
   private static final Log LOG = LogFactory.getLog(SheetUtils.class);
 
   public static void decode(FacesContext facesContext, UIComponent component) {
-    String actionId = ComponentUtil.findPage(facesContext, component).getActionId();
+    String actionId = ComponentUtils.findPage(facesContext, component).getActionId();
     String clientId = component.getClientId(facesContext);
     if (LOG.isDebugEnabled()) {
       LOG.debug("actionId = '" + actionId + "'");

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java Fri Oct 30 16:51:31 2009
@@ -25,7 +25,7 @@
 import org.apache.myfaces.tobago.component.SupportsMarkup;
 import org.apache.myfaces.tobago.context.ClientProperties;
 import org.apache.myfaces.tobago.context.Theme;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
@@ -213,18 +213,18 @@
     removeTobagoClasses(rendererName);
 
     addAspectClass(rendererName, Aspect.DEFAULT);
-    if (ComponentUtil.getBooleanAttribute(component, Attributes.DISABLED)) {
+    if (ComponentUtils.getBooleanAttribute(component, Attributes.DISABLED)) {
       addAspectClass(rendererName, Aspect.DISABLED);
     }
-    if (ComponentUtil.getBooleanAttribute(component, Attributes.READONLY)) {
+    if (ComponentUtils.getBooleanAttribute(component, Attributes.READONLY)) {
       addAspectClass(rendererName, Aspect.READONLY);
     }
-    if (ComponentUtil.getBooleanAttribute(component, Attributes.INLINE)) {
+    if (ComponentUtils.getBooleanAttribute(component, Attributes.INLINE)) {
       addAspectClass(rendererName, Aspect.INLINE);
     }
     if (component instanceof UIInput) {
       UIInput input = (UIInput) component;
-      if (ComponentUtil.isError(input)) {
+      if (ComponentUtils.isError(input)) {
         addAspectClass(rendererName, Aspect.ERROR);
       }
       if (input.isRequired()) {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/AttributeTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/AttributeTag.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/AttributeTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/AttributeTag.java Fri Oct 30 16:51:31 2009
@@ -24,7 +24,7 @@
 import org.apache.myfaces.tobago.compat.FacesUtils;
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.SupportsRenderedPartially;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.faces.component.UIComponent;
 import javax.faces.webapp.UIComponentTag;
@@ -106,10 +106,10 @@
         throw new JspException("Can not get ValueBinding for attribute value " + getValueExpression());
       }
     } else if (Attributes.STYLE_CLASS.equals(attributeName)) {
-      ComponentUtil.setStyleClasses(component, getValueValue());
+      ComponentUtils.setStyleClasses(component, getValueValue());
     } else if (Attributes.RENDERED_PARTIALLY.equals(attributeName)
         && component instanceof SupportsRenderedPartially) {
-      String[] components = ComponentUtil.splitList(getValueValue());
+      String[] components = ComponentUtils.splitList(getValueValue());
       ((SupportsRenderedPartially) component).setRenderedPartially(components);
     } else {
       component.getAttributes().put(attributeName, getValueValue());

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ScriptTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ScriptTag.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ScriptTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ScriptTag.java Fri Oct 30 16:51:31 2009
@@ -18,8 +18,8 @@
  */
 
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import org.apache.myfaces.tobago.util.ComponentUtil;
 import org.apache.myfaces.tobago.component.AbstractUIPage;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.faces.context.FacesContext;
 import javax.servlet.jsp.JspException;
@@ -66,7 +66,7 @@
   public int doEndTag() throws JspException {
 
     FacesContext facesContext = FacesContext.getCurrentInstance();
-    AbstractUIPage page = ComponentUtil.findPage(facesContext);
+    AbstractUIPage page = ComponentUtils.findPage(facesContext);
     if (page == null) {
       throw new JspException("The ScriptTag cannot find UIPage. "
           + "Check you have defined the ScriptTag inside of the PageTag!");

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/StyleTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/StyleTag.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/StyleTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/StyleTag.java Fri Oct 30 16:51:31 2009
@@ -18,9 +18,9 @@
  */
 
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import org.apache.myfaces.tobago.util.ComponentUtil;
 import org.apache.myfaces.tobago.component.AbstractUIPage;
 import org.apache.myfaces.tobago.taglib.decl.HasId;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.faces.context.FacesContext;
 import javax.servlet.jsp.JspException;
@@ -49,7 +49,7 @@
   public int doEndTag() throws JspException {
 
     FacesContext facesContext = FacesContext.getCurrentInstance();
-    AbstractUIPage page = ComponentUtil.findPage(facesContext);
+    AbstractUIPage page = ComponentUtils.findPage(facesContext);
     if (page == null) {
       throw new JspException("The StyleTag cannot find the UIPage. "
           + "Check you have defined the StyleTag inside of the PageTag!");

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/EncodeAjaxCallback.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/EncodeAjaxCallback.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/EncodeAjaxCallback.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/EncodeAjaxCallback.java Fri Oct 30 16:51:31 2009
@@ -21,9 +21,9 @@
 import org.apache.myfaces.tobago.ajax.api.AjaxComponent;
 import org.apache.myfaces.tobago.renderkit.RendererBase;
 
-import javax.faces.context.FacesContext;
-import javax.faces.component.UIComponent;
 import javax.faces.FacesException;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
 import java.io.IOException;
 import java.util.Iterator;
 
@@ -41,7 +41,7 @@
 
   // TODO merge with RenderUtil.prepareRendererAll
   public static void prepareRendererAll(FacesContext facesContext, UIComponent component) throws IOException {
-    RendererBase renderer = ComponentUtil.getRendererBase(facesContext,  component);
+    RendererBase renderer = ComponentUtils.getRendererBase(facesContext,  component);
     boolean prepareRendersChildren = false;
     if (renderer != null) {
       renderer.prepareRender(facesContext, component);

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ProcessValidationsCallback.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ProcessValidationsCallback.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ProcessValidationsCallback.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ProcessValidationsCallback.java Fri Oct 30 16:51:31 2009
@@ -20,8 +20,8 @@
 
 import org.apache.myfaces.tobago.component.AbstractUIForm;
 
-import javax.faces.context.FacesContext;
 import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
 
 public class ProcessValidationsCallback implements javax.faces.component.ContextCallback {
 
@@ -31,7 +31,7 @@
       component.processValidators(facesContext);
     } else {
       // if we're not the submitted form, only process subforms.
-      for (AbstractUIForm subForm : ComponentUtil.findSubForms(component)) {
+      for (AbstractUIForm subForm : ComponentUtils.findSubForms(component)) {
         subForm.processValidators(facesContext);
       }
     }

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/UpdateModelValuesCallback.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/UpdateModelValuesCallback.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/UpdateModelValuesCallback.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/UpdateModelValuesCallback.java Fri Oct 30 16:51:31 2009
@@ -20,8 +20,8 @@
 
 import org.apache.myfaces.tobago.component.AbstractUIForm;
 
-import javax.faces.context.FacesContext;
 import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
 
 public class UpdateModelValuesCallback implements javax.faces.component.ContextCallback {
 
@@ -31,7 +31,7 @@
       component.processUpdates(facesContext);
     } else {
       // if we're not the submitted form, only process subforms.
-      for (AbstractUIForm subForm : ComponentUtil.findSubForms(component)) {
+      for (AbstractUIForm subForm : ComponentUtils.findSubForms(component)) {
         subForm.processUpdates(facesContext);
       }
     }

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/validator/ClearValidatorsActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/validator/ClearValidatorsActionListener.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/validator/ClearValidatorsActionListener.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/validator/ClearValidatorsActionListener.java Fri Oct 30 16:51:31 2009
@@ -24,7 +24,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
@@ -50,7 +50,7 @@
     }
     UIComponent source = actionEvent.getComponent();
     String clearValidatorsFieldIds
-        = (String) ComponentUtil.findParameter(source, "clearValidatorsFieldIds");
+        = (String) ComponentUtils.findParameter(source, "clearValidatorsFieldIds");
 
     if (LOG.isDebugEnabled()) {
       LOG.debug("clearValidatorsFieldIds = '" + clearValidatorsFieldIds + "'");

Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/ComponentUtilUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/ComponentUtilUnitTest.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/ComponentUtilUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/ComponentUtilUnitTest.java Fri Oct 30 16:51:31 2009
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -25,10 +25,10 @@
 
   @Test
   public void testSplitList() {
-    Assert.assertArrayEquals(new String[]{"ab", "cd"}, ComponentUtil.splitList("ab cd"));
-    Assert.assertArrayEquals(new String[]{"ab", "cd"}, ComponentUtil.splitList("ab  cd"));
-    Assert.assertArrayEquals(new String[]{"ab", "cd"}, ComponentUtil.splitList("ab,  cd"));
-    Assert.assertArrayEquals(new String[]{"ab", "cd"}, ComponentUtil.splitList("ab , cd"));
-    Assert.assertArrayEquals(new String[]{"ab", "cd"}, ComponentUtil.splitList("ab,,cd"));
+    Assert.assertArrayEquals(new String[]{"ab", "cd"}, ComponentUtils.splitList("ab cd"));
+    Assert.assertArrayEquals(new String[]{"ab", "cd"}, ComponentUtils.splitList("ab  cd"));
+    Assert.assertArrayEquals(new String[]{"ab", "cd"}, ComponentUtils.splitList("ab,  cd"));
+    Assert.assertArrayEquals(new String[]{"ab", "cd"}, ComponentUtils.splitList("ab , cd"));
+    Assert.assertArrayEquals(new String[]{"ab", "cd"}, ComponentUtils.splitList("ab,,cd"));
   }
 }

Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java Fri Oct 30 16:51:31 2009
@@ -30,7 +30,7 @@
 import org.apache.myfaces.tobago.mock.servlet.MockHttpServletRequest;
 import org.apache.myfaces.tobago.mock.servlet.MockHttpServletResponse;
 import org.apache.myfaces.tobago.mock.servlet.MockServletContext;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.faces.FactoryFinder;
 import javax.faces.application.Application;
@@ -164,8 +164,8 @@
       Object height = attributes.get(Attributes.HEIGHT);
       LOG.debug("height = '" + height + "'");
 
-      assertTrue(ComponentUtil.getBooleanAttribute(command, Attributes.DISABLED));
-      assertFalse(ComponentUtil.getBooleanAttribute(command, Attributes.HEIGHT));
+      assertTrue(ComponentUtils.getBooleanAttribute(command, Attributes.DISABLED));
+      assertFalse(ComponentUtils.getBooleanAttribute(command, Attributes.HEIGHT));
     }
   }
   private static class MockTheme implements Theme {

Modified: myfaces/tobago/trunk/example/demo/src/main/resources/log4j.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/resources/log4j.xml?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/resources/log4j.xml (original)
+++ myfaces/tobago/trunk/example/demo/src/main/resources/log4j.xml Fri Oct 30 16:51:31 2009
@@ -60,10 +60,6 @@
     <!--<priority value="debug" />-->
   <!--</category>-->
 
-  <!--<category name="org.apache.myfaces.tobago.component.ComponentUtil">-->
-    <!--<priority value="debug" />-->
-  <!--</category>-->
-
 <!--  <category name="org.apache.catalina.core.ApplicationDispatcher">-->
 <!--    <priority value="debug" />-->
 <!--  </category>-->

Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java Fri Oct 30 16:51:31 2009
@@ -33,7 +33,7 @@
 import org.apache.myfaces.tobago.component.SupportsMarkup;
 import org.apache.myfaces.tobago.component.SupportsRenderedPartially;
 import org.apache.myfaces.tobago.el.ConstantMethodBinding;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.el.ELException;
 import javax.el.ExpressionFactory;
@@ -141,7 +141,7 @@
           if (expressionString != null) {
             ExpressionFactory expressionFactory = faceletContext.getExpressionFactory();
             MethodExpression action = new TagMethodExpression(value, expressionFactory.createMethodExpression(
-                faceletContext, expressionString, String.class, ComponentUtil.ACTION_ARGS));
+                faceletContext, expressionString, String.class, ComponentUtils.ACTION_ARGS));
             // TODO jsf 1.2
             ((ActionSource) parent).setAction(new LegacyMethodBinding(action));
           }
@@ -170,7 +170,7 @@
           if (expressionString != null) {
             ExpressionFactory expressionFactory = faceletContext.getExpressionFactory();
             MethodExpression actionListener = new TagMethodExpression(value, expressionFactory.createMethodExpression(
-                faceletContext, expressionString, null, ComponentUtil.ACTION_LISTENER_ARGS));
+                faceletContext, expressionString, null, ComponentUtils.ACTION_LISTENER_ARGS));
             // TODO jsf 1.2
             ((ActionSource) parent).setActionListener(new LegacyMethodBinding(actionListener));
           }
@@ -221,18 +221,18 @@
             && parent instanceof SupportsRenderedPartially) {
 
           if (value.isLiteral()) {
-            String[] components = ComponentUtil.splitList(value.getValue());
+            String[] components = ComponentUtils.splitList(value.getValue());
             ((SupportsRenderedPartially) parent).setRenderedPartially(components);
           } else {
             ELAdaptor.setExpression(parent, nameValue, value.getValueExpression(faceletContext, Object.class));
           }
         } else if (Attributes.STYLE_CLASS.equals(nameValue)) {
           // TODO expression
-          ComponentUtil.setStyleClasses(parent, value.getValue());
+          ComponentUtils.setStyleClasses(parent, value.getValue());
         } else if (Attributes.MARKUP.equals(nameValue)) {
           if (parent instanceof SupportsMarkup) {
             if (value.isLiteral()) {
-              ComponentUtil.setMarkup(parent, value.getValue());
+              ComponentUtils.setMarkup(parent, value.getValue());
             } else {
               ValueExpression expression = value.getValueExpression(faceletContext, Object.class);
               ELAdaptor.setExpression(parent, nameValue, expression);
@@ -241,7 +241,7 @@
             LOG.error("Component is not instanceof SupportsMarkup. Instance is: " + parent.getClass().getName());
           }
         } else if (parent instanceof EditableValueHolder && Attributes.VALIDATOR.equals(nameValue)) {
-          MethodExpression methodExpression = getMethodExpression(faceletContext, null, ComponentUtil.VALIDATOR_ARGS);
+          MethodExpression methodExpression = getMethodExpression(faceletContext, null, ComponentUtils.VALIDATOR_ARGS);
           if (methodExpression != null) {
             // TODO jsf 1.2
             ((EditableValueHolder) parent).setValidator(new LegacyMethodBinding(methodExpression));
@@ -249,7 +249,7 @@
         } else if (parent instanceof EditableValueHolder
             && Attributes.VALUE_CHANGE_LISTENER.equals(nameValue)) {
           MethodExpression methodExpression =
-              getMethodExpression(faceletContext, null, ComponentUtil.VALUE_CHANGE_LISTENER_ARGS);
+              getMethodExpression(faceletContext, null, ComponentUtils.VALUE_CHANGE_LISTENER_ARGS);
           if (methodExpression != null) {
             // TODO jsf 1.2
             ((EditableValueHolder) parent).setValueChangeListener(new LegacyMethodBinding(methodExpression));
@@ -257,13 +257,13 @@
         } else if (parent instanceof ValueHolder && Attributes.CONVERTER.equals(nameValue)) {
           setConverter(faceletContext, parent, nameValue);
         } else if (parent instanceof ActionSource && Attributes.ACTION.equals(nameValue)) {
-          MethodExpression action = getMethodExpression(faceletContext, String.class, ComponentUtil.ACTION_ARGS);
+          MethodExpression action = getMethodExpression(faceletContext, String.class, ComponentUtils.ACTION_ARGS);
           if (action != null) {
             // TODO jsf 1.2
             ((ActionSource) parent).setAction(new LegacyMethodBinding(action));
           }
         } else if (parent instanceof ActionSource && Attributes.ACTION_LISTENER.equals(nameValue)) {
-          MethodExpression action = getMethodExpression(faceletContext, null, ComponentUtil.ACTION_LISTENER_ARGS);
+          MethodExpression action = getMethodExpression(faceletContext, null, ComponentUtils.ACTION_LISTENER_ARGS);
           if (action != null) {
             // TODO jsf 1.2
             ((ActionSource) parent).setActionListener(new LegacyMethodBinding(action));

Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java Fri Oct 30 16:51:31 2009
@@ -25,7 +25,7 @@
 import com.sun.facelets.tag.TagAttribute;
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.SupportsMarkup;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.el.ValueExpression;
 import javax.faces.component.UIComponent;
@@ -58,7 +58,7 @@
 
     public void applyMetadata(FaceletContext ctx, Object instance) {
       if (attribute.isLiteral()) {
-        ComponentUtil.setMarkup((UIComponent) instance, attribute.getValue());
+        ComponentUtils.setMarkup((UIComponent) instance, attribute.getValue());
       } else {
         ValueExpression expression = attribute.getValueExpression(ctx, Object.class);
         ELAdaptor.setExpression((UIComponent) instance, Attributes.MARKUP, expression);

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=831383&r1=831382&r2=831383&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 Fri Oct 30 16:51:31 2009
@@ -39,7 +39,7 @@
 import org.apache.myfaces.tobago.facelets.SuggestMethodRule;
 import org.apache.myfaces.tobago.facelets.SupportsMarkupRule;
 import org.apache.myfaces.tobago.layout.LayoutUtils;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.el.ELException;
 import javax.el.ValueExpression;
@@ -160,7 +160,7 @@
     }
     if (markupAttribute != null) {
       if (markupAttribute.isLiteral()) {
-        ComponentUtil.setMarkup(label, markupAttribute.getValue());
+        ComponentUtils.setMarkup(label, markupAttribute.getValue());
       } else {
         ValueExpression expression = markupAttribute.getValueExpression(faceletContext, Object.class);
         ELAdaptor.setExpression(label, Attributes.MARKUP, expression);

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/InputNumberSliderRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/InputNumberSliderRenderer.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/InputNumberSliderRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/InputNumberSliderRenderer.java Fri Oct 30 16:51:31 2009
@@ -30,7 +30,7 @@
 import org.apache.myfaces.tobago.renderkit.html.HtmlStyleMap;
 import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
 import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 
 import javax.faces.component.UIComponent;
@@ -56,10 +56,10 @@
 
     String id = component.getClientId(facesContext);
     String currentValue = getCurrentValue(facesContext, component);
-    boolean readonly = ComponentUtil.getBooleanAttribute(component, Attributes.READONLY);
-    boolean disabled = ComponentUtil.getBooleanAttribute(component, Attributes.DISABLED);
-    Integer min = ComponentUtil.getIntAttribute(component, "min");
-    Integer max = ComponentUtil.getIntAttribute(component, "max");
+    boolean readonly = ComponentUtils.getBooleanAttribute(component, Attributes.READONLY);
+    boolean disabled = ComponentUtils.getBooleanAttribute(component, Attributes.DISABLED);
+    Integer min = ComponentUtils.getIntAttribute(component, "min");
+    Integer max = ComponentUtils.getIntAttribute(component, "max");
     TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
 
 
@@ -166,7 +166,7 @@
 
   public void decode(FacesContext context, UIComponent component) {
     UIInput uiInput;
-    if (component instanceof UIInput && !ComponentUtil.isOutputOnly(component)) {
+    if (component instanceof UIInput && !ComponentUtils.isOutputOnly(component)) {
       uiInput = (UIInput) component;
     } else {
       return;
@@ -210,8 +210,8 @@
     String handleId = getIdForSliderHandle(context, component);
     String inputId = getIdForInputField(context, component);
     String jsId = component.getClientId(context).replace(":", "_");
-    Integer min = ComponentUtil.getIntAttribute(component, "min");
-    Integer max = ComponentUtil.getIntAttribute(component, "max");
+    Integer min = ComponentUtils.getIntAttribute(component, "min");
+    Integer max = ComponentUtils.getIntAttribute(component, "max");
     String script = "    var slider_" + jsId + " = new Control.Slider('" + handleId + "', '" + trackId + "', {\n"
         + "        sliderValue:$('" + inputId + "').value,\n"
         + "        range : $R(" + min + ", " + max + "),\n"

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java Fri Oct 30 16:51:31 2009
@@ -31,7 +31,7 @@
 import org.apache.myfaces.tobago.component.Facets;
 import org.apache.myfaces.tobago.renderkit.LayoutableRendererBase;
 import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 
 import javax.faces.component.UICommand;
@@ -48,7 +48,7 @@
       throws IOException {
 
     UICommand command = (UICommand) component;
-    AbstractUIPage page = ComponentUtil.findPage(facesContext, command);
+    AbstractUIPage page = ComponentUtils.findPage(facesContext, command);
 
     TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
     // TODO

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/InRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/InRenderer.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/InRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/InRenderer.java Fri Oct 30 16:51:31 2009
@@ -29,7 +29,7 @@
 import org.apache.myfaces.tobago.renderkit.LayoutableRendererBase;
 import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
 import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 
 import javax.faces.component.UIComponent;
@@ -45,7 +45,7 @@
 
     String clientId = component.getClientId(facesContext);
 
-    AbstractUIPage uiPage = ComponentUtil.findPage(facesContext, component);
+    AbstractUIPage uiPage = ComponentUtils.findPage(facesContext, component);
 
     if (uiPage != null) {
       uiPage.getPostfields().add(new DefaultKeyValue(clientId, clientId));
@@ -58,7 +58,7 @@
 
     String currentValue = RenderUtil.currentValue(component);
 
-    String type = ComponentUtil.getBooleanAttribute(
+    String type = ComponentUtils.getBooleanAttribute(
         component, Attributes.PASSWORD) ? "password" : "text";
 
     writer.startElement("input", component);

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectBooleanCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectBooleanCheckboxRenderer.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectBooleanCheckboxRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectBooleanCheckboxRenderer.java Fri Oct 30 16:51:31 2009
@@ -28,7 +28,7 @@
 import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
 import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
 import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 
 import javax.faces.component.UIComponent;
@@ -42,7 +42,7 @@
 
     TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
 
-    boolean value = ComponentUtil.getBooleanAttribute(component, Attributes.VALUE);
+    boolean value = ComponentUtils.getBooleanAttribute(component, Attributes.VALUE);
 
     writer.startElement(HtmlConstants.SELECT, component);
     writer.writeNameAttribute(component.getClientId(facesContext));

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectOneChoiceRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectOneChoiceRenderer.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectOneChoiceRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectOneChoiceRenderer.java Fri Oct 30 16:51:31 2009
@@ -28,7 +28,7 @@
 import org.apache.myfaces.tobago.renderkit.LayoutableRendererBase;
 import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
 import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 
 import javax.faces.component.UIComponent;
@@ -45,7 +45,7 @@
       throws IOException {
 
     UISelectOne selectOne = (UISelectOne) component;
-    AbstractUIPage page = ComponentUtil.findPage(facesContext, selectOne);
+    AbstractUIPage page = ComponentUtils.findPage(facesContext, selectOne);
 
     TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
 

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/tag/MessageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/tag/MessageRenderer.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/tag/MessageRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/tag/MessageRenderer.java Fri Oct 30 16:51:31 2009
@@ -30,7 +30,7 @@
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
 import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 
 import javax.faces.application.FacesMessage;
@@ -53,14 +53,14 @@
 
     UIMessage component = (UIMessage) uiComponent;
 
-    String clientId = ComponentUtil.findClientIdFor(component, facesContext);
+    String clientId = ComponentUtils.findClientIdFor(component, facesContext);
 
     Iterator iterator = facesContext.getMessages(clientId);
 
     TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
 
-    boolean showSummary = ComponentUtil.getBooleanAttribute(component, Attributes.SHOW_SUMMARY);
-    boolean showDetail = ComponentUtil.getBooleanAttribute(component, Attributes.SHOW_DETAIL);
+    boolean showSummary = ComponentUtils.getBooleanAttribute(component, Attributes.SHOW_SUMMARY);
+    boolean showDetail = ComponentUtils.getBooleanAttribute(component, Attributes.SHOW_DETAIL);
 
     if (iterator.hasNext()) {
 

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java Fri Oct 30 16:51:31 2009
@@ -37,7 +37,7 @@
 import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
 import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
 import org.apache.myfaces.tobago.util.AccessKeyMap;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 
 import javax.faces.component.UIComponent;
@@ -110,8 +110,8 @@
           facesContext, command.getClientId(facesContext), label.getAccessKey());
     }
 
-    if (ComponentUtil.getBooleanAttribute(component, Attributes.DEFAULT_COMMAND)) {
-      boolean transition = ComponentUtil.getBooleanAttribute(command, Attributes.TRANSITION);
+    if (ComponentUtils.getBooleanAttribute(component, Attributes.DEFAULT_COMMAND)) {
+      boolean transition = ComponentUtils.getBooleanAttribute(command, Attributes.TRANSITION);
       HtmlRendererUtil.setDefaultTransition(facesContext, transition);
 
       HtmlRendererUtil.writeScriptLoader(facesContext, null, new String[]{
@@ -120,7 +120,7 @@
   }
 
   private String createButtonType(UIComponent component) {
-    boolean defaultCommand = ComponentUtil.getBooleanAttribute(component, Attributes.DEFAULT_COMMAND);
+    boolean defaultCommand = ComponentUtils.getBooleanAttribute(component, Attributes.DEFAULT_COMMAND);
     return defaultCommand ? "submit" : "button";
   }
 

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=831383&r1=831382&r2=831383&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 Fri Oct 30 16:51:31 2009
@@ -40,7 +40,7 @@
 import org.apache.myfaces.tobago.event.PopupActionListener;
 import org.apache.myfaces.tobago.layout.PixelMeasure;
 import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.util.DateFormatUtils;
 
 import javax.faces.component.UICommand;
@@ -249,7 +249,7 @@
 
     applyConverterPattern(facesContext, popup, converterPattern);
 
-    if (!ComponentUtil.containsPopupActionListener(link)) {
+    if (!ComponentUtils.containsPopupActionListener(link)) {
       link.addActionListener(new PopupActionListener(popup.getId()));
     }
     super.encodeBegin(facesContext, component);
@@ -260,7 +260,7 @@
     UIComponent timePanel = box.findComponent("timePanel");
     if (converterPattern != null && (converterPattern.indexOf('h') > -1 || converterPattern.indexOf('H') > -1)) {
       UIComponent time = timePanel.findComponent("time");
-      int popupHeight = ComponentUtil.getIntAttribute(popup, Attributes.HEIGHT);
+      int popupHeight = ComponentUtils.getIntAttribute(popup, Attributes.HEIGHT);
       popupHeight += ThemeConfig.getValue(FacesContext.getCurrentInstance(), time, "fixedHeight");
       popup.getAttributes().put(Attributes.HEIGHT, popupHeight);
       DateTimeConverter dateTimeConverter

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java Fri Oct 30 16:51:31 2009
@@ -32,7 +32,7 @@
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
 import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.webapp.TobagoMultipartFormdataRequest;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 
@@ -63,7 +63,7 @@
       return;
     }
 
-    if (ComponentUtil.isOutputOnly(component)) {
+    if (ComponentUtils.isOutputOnly(component)) {
       return;
     }
 
@@ -119,7 +119,7 @@
 //    }
     writer.writeNameAttribute(clientId);
     writer.writeIdAttribute(clientId);
-    writer.writeAttribute(HtmlAttributes.READONLY, ComponentUtil.getBooleanAttribute(input, Attributes.DISABLED));
+    writer.writeAttribute(HtmlAttributes.READONLY, ComponentUtils.getBooleanAttribute(input, Attributes.DISABLED));
     Integer tabIndex = input.getTabIndex();
     if (tabIndex != null) {
       writer.writeAttribute(HtmlAttributes.TABINDEX, tabIndex);

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FormRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FormRenderer.java?rev=831383&r1=831382&r2=831383&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FormRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FormRenderer.java Fri Oct 30 16:51:31 2009
@@ -22,9 +22,9 @@
  * $Id$
  */
 
-import org.apache.myfaces.tobago.util.ComponentUtil;
 import org.apache.myfaces.tobago.component.AbstractUIPage;
 import org.apache.myfaces.tobago.renderkit.RendererBase;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIForm;
@@ -34,7 +34,7 @@
 
   public void decode(FacesContext facesContext, UIComponent component) {
     UIForm form = (UIForm) component;
-    AbstractUIPage page = ComponentUtil.findPage(facesContext, form);
+    AbstractUIPage page = ComponentUtils.findPage(facesContext, form);
     String actionId = page.getActionId();
     String clientId = form.getClientId(facesContext);
     if (actionId != null && actionId.startsWith(clientId)) {