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 2004/09/15 17:22:26 UTC
cvs commit: jakarta-tapestry/framework/src/org/apache/tapestry/html Body.java
hlship 2004/09/15 08:22:26
Modified: framework/src/org/apache/tapestry/html Tag: branch-3-0
Body.java
Log:
Make the writeScript() method of Body protected, so that a subclass can invoke it.
Revision Changes Path
No revision
No revision
1.11.2.1 +19 -20 jakarta-tapestry/framework/src/org/apache/tapestry/html/Attic/Body.java
Index: Body.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/html/Attic/Body.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- Body.java 19 Feb 2004 17:37:44 -0000 1.11
+++ Body.java 15 Sep 2004 15:22:26 -0000 1.11.2.1
@@ -278,7 +278,7 @@
// Write the page's scripting. This is included scripts
// and dynamic JavaScript, including initialization.
- writeScript();
+ writeScript(_outerWriter);
// Close the nested writer, which dumps its buffered content
// into its parent.
@@ -312,7 +312,6 @@
_bodyScript.setLength(0);
_outerWriter = null;
- _outerWriter = null;
}
/**
@@ -330,45 +329,45 @@
* then a function to execute them is created.
**/
- private void writeScript()
+ private void writeScript(IMarkupWriter writer)
{
if (!Tapestry.isEmpty(_externalScripts))
- writeExternalScripts(_outerWriter);
+ writeExternalScripts(writer);
if (!(any(_initializationScript) || any(_bodyScript) || any(_imageInitializations)))
return;
- _outerWriter.begin("script");
- _outerWriter.attribute("language", "JavaScript");
- _outerWriter.printRaw("<!--");
+ writer.begin("script");
+ writer.attribute("language", "JavaScript");
+ writer.printRaw("<!--");
if (any(_imageInitializations))
{
- _outerWriter.printRaw("\n\nvar tapestry_preload = new Array();\n");
- _outerWriter.printRaw("if (document.images)\n");
- _outerWriter.printRaw("{\n");
- _outerWriter.printRaw(_imageInitializations.toString());
- _outerWriter.printRaw("}\n");
+ writer.printRaw("\n\nvar tapestry_preload = new Array();\n");
+ writer.printRaw("if (document.images)\n");
+ writer.printRaw("{\n");
+ writer.printRaw(_imageInitializations.toString());
+ writer.printRaw("}\n");
}
if (any(_bodyScript))
{
- _outerWriter.printRaw("\n\n");
- _outerWriter.printRaw(_bodyScript.toString());
+ writer.printRaw("\n\n");
+ writer.printRaw(_bodyScript.toString());
}
if (any(_initializationScript))
{
- _outerWriter.printRaw("\n\n" + "window.onload = function ()\n" + "{\n");
+ writer.printRaw("\n\n" + "window.onload = function ()\n" + "{\n");
- _outerWriter.printRaw(_initializationScript.toString());
+ writer.printRaw(_initializationScript.toString());
- _outerWriter.printRaw("}");
+ writer.printRaw("}");
}
- _outerWriter.printRaw("\n\n// -->");
- _outerWriter.end();
+ writer.printRaw("\n\n// -->");
+ writer.end();
}
private boolean any(StringBuffer buffer)
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org