You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2005/07/09 04:46:37 UTC
cvs commit: jakarta-tapestry/framework/src/java/org/apache/tapestry/html Script.java
hlship 2005/07/08 19:46:37
Modified: . status.xml
framework/src/java/org/apache/tapestry/html Script.java
Log:
TAPESTRY-374: Script component is not picking up the symbols parameter
Revision Changes Path
1.155 +1 -0 jakarta-tapestry/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/status.xml,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- status.xml 9 Jul 2005 01:38:15 -0000 1.154
+++ status.xml 9 Jul 2005 02:46:37 -0000 1.155
@@ -63,6 +63,7 @@
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-370">@Message does not work with parameters</action>
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-388">Wrong property type on injected assets fails with confusing message</action>
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-389">asset service: send 304 status code when appropriate</action>
+ <action type="fix" dev="HLS" fixes-bug="TAPESTRY-374" due-to="Paul Green">Script component is not picking up the symbols parameter</action>
</release>
<release version="4.0-beta-1" date="Jun 24 2005">
<action type="add" dev="HLS">Add InvokeListener component.</action>
1.5 +6 -12 jakarta-tapestry/framework/src/java/org/apache/tapestry/html/Script.java
Index: Script.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/html/Script.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Script.java 29 Mar 2005 13:35:42 -0000 1.4
+++ Script.java 9 Jul 2005 02:46:37 -0000 1.5
@@ -41,8 +41,6 @@
public abstract class Script extends AbstractComponent
{
- private Map _baseSymbols;
-
/**
* A Map of input and output symbols visible to the body of the Script.
*
@@ -62,8 +60,10 @@
{
Map result = new HashMap();
- if (_baseSymbols != null)
- result.putAll(_baseSymbols);
+ Map baseSymbols = getBaseSymbols();
+
+ if (baseSymbols != null)
+ result.putAll(baseSymbols);
// Now, iterate through all the binding names (which includes both
// formal and informal parmeters). Skip the formal ones and
@@ -137,15 +137,9 @@
public abstract String getScriptPath();
- public Map getBaseSymbols()
- {
- return _baseSymbols;
- }
+ // Parameter
- public void setBaseSymbols(Map baseSymbols)
- {
- _baseSymbols = baseSymbols;
- }
+ public abstract Map getBaseSymbols();
/**
* Returns the complete set of symbols (input and output) from the script execution. This is
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org