haul 2002/12/06 02:04:18
Modified: src/java/org/apache/cocoon/components/language/markup/xsp/java
input.xsl
Log:
renamed all methods from getParameter* to getAttribute* to be consistent
with the InputModule method names.
Revision Changes Path
1.4 +12 -12
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/input.xsl
Index: input.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/input.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- input.xsl 5 Dec 2002 20:05:50 -0000 1.3
+++ input.xsl 6 Dec 2002 10:04:18 -0000 1.4
@@ -105,7 +105,7 @@
<xsl:with-param name="required">false</xsl:with-param>
</xsl:call-template>
</xsl:variable>
- <!-- parameter name, no default, required -->
+ <!-- attribute name, no default, required -->
<xsl:variable name="name">
<xsl:call-template name="get-string-attribute">
<xsl:with-param name="name">name</xsl:with-param>
@@ -130,11 +130,11 @@
<!-- -->
<xsl:choose>
<xsl:when test="$as = 'object'">
- <xsp:expr>this._xsp_module_helper.getParameter(objectModel, <xsl:copy-of
select="$module"/>,<xsl:copy-of select="$name"/>,<xsl:copy-of
select="$default"/>)</xsp:expr>
+ <xsp:expr>this._xsp_module_helper.getAttribute(objectModel, <xsl:copy-of
select="$module"/>,<xsl:copy-of select="$name"/>,<xsl:copy-of
select="$default"/>)</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'string'">
<xsp:expr>
- String.valueOf(this._xsp_module_helper.getParameter(objectModel,
<xsl:copy-of select="$module"/>,<xsl:copy-of select="$name"/>,<xsl:copy-of
select="$default"/>))
+ String.valueOf(this._xsp_module_helper.getAttribute(objectModel,
<xsl:copy-of select="$module"/>,<xsl:copy-of select="$name"/>,<xsl:copy-of
select="$default"/>))
</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
@@ -142,7 +142,7 @@
<xsp:attribute name="name">
<xsp:expr><xsl:copy-of select="$name"/></xsp:expr>
</xsp:attribute>
- <xsp:expr>this._xsp_module_helper.getParameter(objectModel, <xsl:copy-of
select="$module"/>,<xsl:copy-of select="$name"/>,<xsl:copy-of
select="$default"/>)</xsp:expr>
+ <xsp:expr>this._xsp_module_helper.getAttribute(objectModel, <xsl:copy-of
select="$module"/>,<xsl:copy-of select="$name"/>,<xsl:copy-of
select="$default"/>)</xsp:expr>
</input:attribute>
</xsl:when>
</xsl:choose>
@@ -158,7 +158,7 @@
<xsl:with-param name="required">false</xsl:with-param>
</xsl:call-template>
</xsl:variable>
- <!-- parameter name, no default, required -->
+ <!-- attribute name, no default, required -->
<xsl:variable name="name">
<xsl:call-template name="get-string-attribute">
<xsl:with-param name="name">name</xsl:with-param>
@@ -176,16 +176,16 @@
<!-- -->
<xsl:choose>
<xsl:when test="$as = 'object' or $as = 'array'">
- <xsp:expr>this._xsp_module_helper.getParameterValues(objectModel,
<xsl:copy-of select="$module"/>,<xsl:copy-of select="$name"/>,null)</xsp:expr>
+ <xsp:expr>this._xsp_module_helper.getAttributeValues(objectModel,
<xsl:copy-of select="$module"/>,<xsl:copy-of select="$name"/>,null)</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'string'">
<xsp:expr>
- String.valueOf(this._xsp_module_helper.getParameterValues(objectModel,
<xsl:copy-of select="$module"/>,<xsl:copy-of select="$name"/>,null))
+ String.valueOf(this._xsp_module_helper.getAttributeValues(objectModel,
<xsl:copy-of select="$module"/>,<xsl:copy-of select="$name"/>,null))
</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
<xsp:logic>
- this._xsp_module_helper.getParameterValues(objectModel,
this.contentHandler, <xsl:copy-of select="$module"/>,<xsl:copy-of select="$name"/>);
+ this._xsp_module_helper.getAttributeValues(objectModel,
this.contentHandler, <xsl:copy-of select="$module"/>,<xsl:copy-of select="$name"/>);
</xsp:logic>
</xsl:when>
</xsl:choose>
@@ -213,16 +213,16 @@
<!-- -->
<xsl:choose>
<xsl:when test="$as = 'object'">
- <xsp:expr>this._xsp_module_helper.getParameterNames(objectModel,
<xsl:copy-of select="$module"/>)</xsp:expr>
+ <xsp:expr>this._xsp_module_helper.getAttributeNames(objectModel,
<xsl:copy-of select="$module"/>)</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'string'">
<xsp:expr>
- String.valueOf(this._xsp_module_helper.getParameterNames(objectModel,
<xsl:copy-of select="$module"/>))
+ String.valueOf(this._xsp_module_helper.getAttributeNames(objectModel,
<xsl:copy-of select="$module"/>))
</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
<xsp:logic>
- this._xsp_module_helper.getParameterNames(objectModel,
this.contentHandler, <xsl:copy-of select="$module"/>);
+ this._xsp_module_helper.getAttributeNames(objectModel,
this.contentHandler, <xsl:copy-of select="$module"/>);
</xsp:logic>
</xsl:when>
</xsl:choose>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
