Author: awiner
Date: Fri Oct 20 15:46:21 2006
New Revision: 466297
URL: http://svn.apache.org/viewvc?view=rev&rev=466297
Log:
Take the useful private CoreRendererUtils.getRelativeId() function and move it
to the public API of RenderUtils
Modified:
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/RenderUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRendererUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/MessageUtils.java
Modified:
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/RenderUtils.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/RenderUtils.java?view=diff&rev=466297&r1=466296&r2=466297
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/RenderUtils.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/RenderUtils.java
Fri Oct 20 15:46:21 2006
@@ -18,6 +18,7 @@
import java.io.IOException;
import java.util.List;
+import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
import javax.faces.component.UIForm;
@@ -97,5 +98,43 @@
return null;
return form.getClientId(context);
+ }
+
+ /**
+ * Returns a relative ID for use at rendering time, e.g. "for"
+ * attributes on components. It does not assume that the target
+ * component can be located. A relative ID starting with
+ * NamingContainer.SEPARATOR_CHAR (that is, ':') will be
+ * treated as absolute (after dropping that character).
+ */
+ public static String getRelativeId(
+ FacesContext context,
+ UIComponent from,
+ String relativeId)
+ {
+ if ((relativeId == null) || (relativeId.length() == 0))
+ return null;
+
+ if (relativeId.charAt(0) == NamingContainer.SEPARATOR_CHAR)
+ return relativeId.substring(1);
+
+ UIComponent parentNC = _getParentNamingContainer(from.getParent());
+ if (parentNC == null)
+ return relativeId;
+
+ return (parentNC.getClientId(context) +
+ NamingContainer.SEPARATOR_CHAR + relativeId);
+ }
+
+ private static UIComponent _getParentNamingContainer(UIComponent from)
+ {
+ while (from != null)
+ {
+ if (from instanceof NamingContainer)
+ return from;
+ from = from.getParent();
+ }
+
+ return null;
}
}
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRendererUtils.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRendererUtils.java?view=diff&rev=466297&r1=466296&r2=466297
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRendererUtils.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRendererUtils.java
Fri Oct 20 15:46:21 2006
@@ -15,7 +15,6 @@
*/
package org.apache.myfaces.trinidadinternal.renderkit.core;
-import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -24,6 +23,7 @@
import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.agent.CapabilityKey;
import org.apache.myfaces.trinidad.context.RenderingContext;
+import org.apache.myfaces.trinidad.render.RenderUtils;
public class CoreRendererUtils
{
@@ -36,15 +36,8 @@
UIComponent from,
String relativeId)
{
- if (relativeId == null)
- return null;
-
- UIComponent parentNC = _getParentNamingContainer(from.getParent());
- if (parentNC == null)
- return relativeId;
-
- return (parentNC.getClientId(context) +
- NamingContainer.SEPARATOR_CHAR + relativeId);
+ // Call through to public API
+ return RenderUtils.getRelativeId(context, from, relativeId);
}
@@ -83,17 +76,5 @@
return false;
return true;
- }
-
- private static UIComponent _getParentNamingContainer(UIComponent from)
- {
- while (from != null)
- {
- if (from instanceof NamingContainer)
- return from;
- from = from.getParent();
- }
-
- return null;
}
}
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java?view=diff&rev=466297&r1=466296&r2=466297
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java
Fri Oct 20 15:46:21 2006
@@ -32,10 +32,11 @@
import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidad.event.ReturnEvent;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
+import org.apache.myfaces.trinidad.render.RenderUtils;
+
import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.convert.ColorConverter;
import org.apache.myfaces.trinidad.context.RenderingContext;
-import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRendererUtils;
import org.apache.myfaces.trinidadinternal.renderkit.core.pages.GenericEntry;
import
org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.AliasedScriptlet;
import
org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.ColorFieldInfoScriptlet;
@@ -427,9 +428,9 @@
UIComponent component,
FacesBean bean)
{
- return CoreRendererUtils.getRelativeId(context,
- component,
- getChooseId(bean));
+ return RenderUtils.getRelativeId(context,
+ component,
+ getChooseId(bean));
}
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java?view=diff&rev=466297&r1=466296&r2=466297
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java
Fri Oct 20 15:46:21 2006
@@ -39,12 +39,12 @@
import org.apache.myfaces.trinidad.component.core.input.CoreInputDate;
import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidad.event.ReturnEvent;
+import org.apache.myfaces.trinidad.render.RenderUtils;
import org.apache.myfaces.trinidad.validator.DateTimeRangeValidator;
import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.convert.GenericConverterFactory;
import org.apache.myfaces.trinidad.context.RenderingContext;
-import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRendererUtils;
import org.apache.myfaces.trinidadinternal.renderkit.core.pages.GenericEntry;
import
org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.ConfigurationScriptlet;
import
org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.Scriptlet;
@@ -457,10 +457,10 @@
UIComponent component,
FacesBean bean)
{
- return CoreRendererUtils.getRelativeId(context,
- component,
- getChooseId(bean));
-
+ return RenderUtils.getRelativeId(context,
+ component,
+ getChooseId(bean));
+
}
// Checks to see whether the current dateField should
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/MessageUtils.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/MessageUtils.java?view=diff&rev=466297&r1=466296&r2=466297
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/MessageUtils.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/MessageUtils.java
Fri Oct 20 15:46:21 2006
@@ -22,8 +22,8 @@
import javax.faces.context.FacesContext;
import org.apache.myfaces.trinidad.component.core.output.CoreMessage;
+import org.apache.myfaces.trinidad.render.RenderUtils;
-import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRendererUtils;
import org.apache.myfaces.trinidadinternal.share.util.FastMessageFormat;
import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.laf.base.BaseLafRenderer;
@@ -80,7 +80,7 @@
UIComponent from,
String forParam)
{
- return CoreRendererUtils.getRelativeId(context, from, forParam);
+ return RenderUtils.getRelativeId(context, from, forParam);
}
