Author: dolander
Date: Wed Jan 26 14:30:07 2005
New Revision: 126552
URL: http://svn.apache.org/viewcvs?view=rev&rev=126552
Log:
Rename the JavaScriptUtils class to ScriptRequestState
This is the last bit of name/package refactoring of the JavaScript support
Added:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptRequestState.java
- copied, changed from r126541,
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/JavaScriptUtils.java
Removed:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/JavaScriptUtils.java
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageAnchor.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/PopupSupport.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/ReturnActionViewRenderer.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptBlock.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptContainer.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java?view=diff&rev=126552&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java&r1=126551&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java&r2=126552
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java
Wed Jan 26 14:30:07 2005
@@ -5,7 +5,7 @@
import org.apache.beehive.netui.tags.ByRef;
import org.apache.beehive.netui.tags.HtmlUtils;
import org.apache.beehive.netui.tags.javascript.IScriptReporter;
-import org.apache.beehive.netui.tags.javascript.JavaScriptUtils;
+import org.apache.beehive.netui.tags.javascript.ScriptRequestState;
import org.apache.beehive.netui.tags.javascript.ScriptContainer;
import org.apache.beehive.netui.tags.internal.PageFlowTagUtils;
import org.apache.beehive.netui.tags.rendering.*;
@@ -308,7 +308,7 @@
if (_formSubmit)
_form = getNearestForm();
- JavaScriptUtils jsu = ScriptContainer.getJavaScriptUtils(request);
+ ScriptRequestState jsu =
ScriptContainer.getScriptRequestState(request);
// check the parameters that the user provided
if (_href != null) have++;
@@ -430,7 +430,7 @@
if (_clientAction != null) {
//@todo: we need to support onclick chaining here also...
String action = HtmlUtils.escapeEscapes(_clientAction);
- String entry = JavaScriptUtils.getString("netuiAction",
+ String entry = ScriptRequestState.getString("netuiAction",
new Object[]{action});
_state.onClick = entry;
}
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java?view=diff&rev=126552&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java&r1=126551&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java&r2=126552
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java
Wed Jan 26 14:30:07 2005
@@ -28,7 +28,7 @@
import org.apache.beehive.netui.script.common.ImplicitObjectUtil;
import org.apache.beehive.netui.tags.TagConfig;
import org.apache.beehive.netui.tags.javascript.IScriptReporter;
-import org.apache.beehive.netui.tags.javascript.JavaScriptUtils;
+import org.apache.beehive.netui.tags.javascript.ScriptRequestState;
import org.apache.beehive.netui.tags.javascript.ScriptContainer;
import org.apache.beehive.netui.tags.internal.PageFlowTagUtils;
import org.apache.beehive.netui.tags.rendering.*;
@@ -839,12 +839,12 @@
if (focusName != null) {
String formName = (_beanName != null) ? _beanName : _formId;
- JavaScriptUtils.getFocusScript(formName, focusName, writer);
+ ScriptRequestState.getFocusScript(formName, focusName, writer);
}
}
if (_formSubmit) {
- JavaScriptUtils jsu = ScriptContainer.getJavaScriptUtils(request);
+ ScriptRequestState jsu =
ScriptContainer.getScriptRequestState(request);
jsu.writeAnchorFormSubmit(getScriptReporter(), writer);
}
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java?view=diff&rev=126552&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java&r1=126551&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java&r2=126552
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java
Wed Jan 26 14:30:07 2005
@@ -18,7 +18,7 @@
package org.apache.beehive.netui.tags.html;
import org.apache.beehive.netui.tags.*;
-import org.apache.beehive.netui.tags.javascript.JavaScriptUtils;
+import org.apache.beehive.netui.tags.javascript.ScriptRequestState;
import org.apache.beehive.netui.tags.javascript.IScriptReporter;
import org.apache.beehive.netui.tags.javascript.ScriptContainer;
import org.apache.beehive.netui.tags.rendering.AbstractHtmlControlState;
@@ -564,7 +564,7 @@
return null;
// without a scripRepoter we need to create the actual JavaScript that
will be written out
- JavaScriptUtils jsu =
ScriptContainer.getJavaScriptUtils((HttpServletRequest)
pageContext.getRequest());
+ ScriptRequestState jsu =
ScriptContainer.getScriptRequestState((HttpServletRequest)
pageContext.getRequest());
StringBuilder sb = new StringBuilder(64);
StringBuilderRenderAppender writer = new
StringBuilderRenderAppender(sb);
jsu.getTagIdMapping(tagId, value, writer);
@@ -580,7 +580,7 @@
}
// without a scripRepoter we need to create the actual JavaScript that
will be written out
- JavaScriptUtils jsu =
ScriptContainer.getJavaScriptUtils((HttpServletRequest)
pageContext.getRequest());
+ ScriptRequestState jsu =
ScriptContainer.getScriptRequestState((HttpServletRequest)
pageContext.getRequest());
StringBuilder sb = new StringBuilder(128);
StringBuilderRenderAppender writer = new
StringBuilderRenderAppender(sb);
jsu.getTagIdMapping(tagId, realId, realName, writer);
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageAnchor.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageAnchor.java?view=diff&rev=126552&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageAnchor.java&r1=126551&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageAnchor.java&r2=126552
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageAnchor.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageAnchor.java
Wed Jan 26 14:30:07 2005
@@ -20,7 +20,7 @@
import org.apache.beehive.netui.core.urls.MutableURI;
import org.apache.beehive.netui.tags.ByRef;
import org.apache.beehive.netui.tags.IHtmlAccessable;
-import org.apache.beehive.netui.tags.javascript.JavaScriptUtils;
+import org.apache.beehive.netui.tags.javascript.ScriptRequestState;
import org.apache.beehive.netui.tags.javascript.ScriptContainer;
import org.apache.beehive.netui.tags.internal.PageFlowTagUtils;
import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;
@@ -374,7 +374,7 @@
if (_rolloverImage != null && getJavaScriptAttribute(ONMOUSEOVER) ==
null) {
// cause the roll over script to be inserted
WriteRenderAppender writer = new WriteRenderAppender(pageContext);
- JavaScriptUtils jsu =
ScriptContainer.getJavaScriptUtils((HttpServletRequest)
pageContext.getRequest());
+ ScriptRequestState jsu =
ScriptContainer.getScriptRequestState((HttpServletRequest)
pageContext.getRequest());
jsu.writeRollover(getScriptReporter(), writer);
}
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java?view=diff&rev=126552&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java&r1=126551&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java&r2=126552
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java
Wed Jan 26 14:30:07 2005
@@ -19,7 +19,7 @@
import org.apache.beehive.netui.core.urls.MutableURI;
import org.apache.beehive.netui.tags.IHtmlAccessable;
-import org.apache.beehive.netui.tags.javascript.JavaScriptUtils;
+import org.apache.beehive.netui.tags.javascript.ScriptRequestState;
import org.apache.beehive.netui.tags.javascript.ScriptContainer;
import org.apache.beehive.netui.tags.internal.PageFlowTagUtils;
import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;
@@ -264,7 +264,7 @@
if (_rolloverImage != null && getJavaScriptAttribute(ONMOUSEOVER) ==
null) {
// cause the roll over script to be inserted
- JavaScriptUtils jsu =
ScriptContainer.getJavaScriptUtils((HttpServletRequest)
pageContext.getRequest());
+ ScriptRequestState jsu =
ScriptContainer.getScriptRequestState((HttpServletRequest)
pageContext.getRequest());
WriteRenderAppender writer = new WriteRenderAppender(pageContext);
jsu.writeRollover(getScriptReporter(), writer);
}
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/PopupSupport.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/PopupSupport.java?view=diff&rev=126552&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/PopupSupport.java&r1=126551&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/PopupSupport.java&r2=126552
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/PopupSupport.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/PopupSupport.java
Wed Jan 26 14:30:07 2005
@@ -21,7 +21,7 @@
import org.apache.beehive.netui.tags.internal.ReturnActionViewRenderer;
import org.apache.beehive.netui.tags.javascript.IScriptReporter;
import org.apache.beehive.netui.tags.AbstractClassicTag;
-import org.apache.beehive.netui.tags.javascript.JavaScriptUtils;
+import org.apache.beehive.netui.tags.javascript.ScriptRequestState;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
import javax.servlet.jsp.JspException;
@@ -118,7 +118,7 @@
public String getOnClick(String url)
{
if ( _popupFunc != null ) {
- return JavaScriptUtils.getString("popupSupportOnClickCustom", new
Object[]{_popupFunc});
+ return ScriptRequestState.getString("popupSupportOnClickCustom",
new Object[]{_popupFunc});
}
else {
StringBuilder features = new StringBuilder();
@@ -138,7 +138,7 @@
}
Object[] args = new Object[]{url, _name, features.toString(),
_replace};
- return JavaScriptUtils.getString("popupSupportOnClick", args);
+ return ScriptRequestState.getString("popupSupportOnClick", args);
}
}
@@ -169,19 +169,19 @@
return ret;
}
- public void writeScript(JavaScriptUtils jsu, IScriptReporter
scriptReporter, AbstractRenderAppender results)
+ public void writeScript(ScriptRequestState jsu, IScriptReporter
scriptReporter, AbstractRenderAppender results)
{
// Write the generic function for popping a window.
jsu.writePopupFunc(scriptReporter, results);
// Write the callback that's triggered when the popup window is
closing.
assert (_onPopupDone != null); // addParams() should ensure that
this isn't null
- String func = JavaScriptUtils.getString("popupSupportOnPopupDone", new
Object[]{_onPopupDone});
+ String func = ScriptRequestState.getString("popupSupportOnPopupDone",
new Object[]{_onPopupDone});
if (scriptReporter != null) {
scriptReporter.addScriptFunction(func);
}
else {
- JavaScriptUtils.writeScriptBlock(results, func);
+ ScriptRequestState.writeScriptBlock(results, func);
}
}
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/ReturnActionViewRenderer.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/ReturnActionViewRenderer.java?view=diff&rev=126552&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/ReturnActionViewRenderer.java&r1=126551&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/ReturnActionViewRenderer.java&r2=126552
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/ReturnActionViewRenderer.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/ReturnActionViewRenderer.java
Wed Jan 26 14:30:07 2005
@@ -20,9 +20,9 @@
import org.apache.beehive.netui.pageflow.internal.InternalConstants;
import org.apache.beehive.netui.pageflow.internal.InternalExpressionUtils;
import org.apache.beehive.netui.pageflow.internal.ViewRenderer;
-import org.apache.beehive.netui.tags.javascript.JavaScriptUtils;
+import org.apache.beehive.netui.tags.javascript.ScriptRequestState;
import org.apache.beehive.netui.tags.rendering.ResponseRenderAppender;
-import org.apache.beehive.netui.tags.javascript.JavaScriptUtils;
+import org.apache.beehive.netui.tags.javascript.ScriptRequestState;
import org.apache.beehive.netui.util.logging.Logger;
import javax.servlet.ServletContext;
@@ -95,8 +95,8 @@
throws IOException
{
ResponseRenderAppender appender = new ResponseRenderAppender(response);
- JavaScriptUtils.writeScriptStart(appender);
- appender.append(JavaScriptUtils.getString("popupReturn_begin", null));
+ ScriptRequestState.writeScriptStart(appender);
+ appender.append(ScriptRequestState.getString("popupReturn_begin",
null));
assert request instanceof HttpServletRequest :
request.getClass().getName();
HttpServletRequest httpRequest = (HttpServletRequest) request;
@@ -110,7 +110,7 @@
String value =
InternalExpressionUtils.evaluateMessage(expressionToRetrieve, null,
httpRequest, servletContext);
String item =
- JavaScriptUtils.getString("popupReturn_item", new
Object[]{fieldID, value});
+ ScriptRequestState.getString("popupReturn_item",
new Object[]{fieldID, value});
appender.append(item);
}
catch (ELException e)
@@ -120,7 +120,7 @@
}
}
- appender.append(JavaScriptUtils.getString("popupReturn_end", new
Object[]{ _callbackFunc} ));
- JavaScriptUtils.writeScriptEnd(appender);
+ appender.append(ScriptRequestState.getString("popupReturn_end", new
Object[]{ _callbackFunc} ));
+ ScriptRequestState.writeScriptEnd(appender);
}
}
Deleted:
/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/JavaScriptUtils.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/JavaScriptUtils.java?view=auto&rev=126551
==============================================================================
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptBlock.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptBlock.java?view=diff&rev=126552&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptBlock.java&r1=126551&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptBlock.java&r2=126552
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptBlock.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptBlock.java
Wed Jan 26 14:30:07 2005
@@ -87,7 +87,7 @@
// if we are writting the javaScript inline then do it....
if (_placement == Placement.INLINE || sr == null) {
- JavaScriptUtils.writeScriptBlock(writer,script);
+ ScriptRequestState.writeScriptBlock(writer,script);
return;
}
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptContainer.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptContainer.java?view=diff&rev=126552&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptContainer.java&r1=126551&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptContainer.java&r2=126552
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptContainer.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptContainer.java
Wed Jan 26 14:30:07 2005
@@ -404,12 +404,12 @@
for (String varClass : _initNames.values()) {
String varName = Character.toLowerCase(varClass.charAt(0)) +
varClass.substring(1);
- String initLine =
JavaScriptUtils.getString("createNetUIInitLine", new Object[]{varName,
varClass});
+ String initLine =
ScriptRequestState.getString("createNetUIInitLine", new Object[]{varName,
varClass});
initSb.append(initLine);
}
}
- String script = JavaScriptUtils.getString("createNetUI", new
Object[]{req.getContextPath(),
+ String script = ScriptRequestState.getString("createNetUI", new
Object[]{req.getContextPath(),
initSb.toString()});
addScriptFunction(script);
}
@@ -427,9 +427,9 @@
if (!_runAtClient)
return;
- String s = JavaScriptUtils.getString("defineNetUI", null);
+ String s = ScriptRequestState.getString("defineNetUI", null);
assert(s != null) : "Didn't find the Script 'defineNetUI'";
- JavaScriptUtils.writeScriptBlock(sb, s);
+ ScriptRequestState.writeScriptBlock(sb, s);
}
protected void writeBeforeBlocks(AbstractRenderAppender sb)
@@ -442,7 +442,7 @@
s.append(code);
s.append("\n");
}
- JavaScriptUtils.writeScriptBlock(sb, s.toString());
+ ScriptRequestState.writeScriptBlock(sb, s.toString());
}
@@ -456,7 +456,7 @@
s.append(code);
s.append("\n");
}
- JavaScriptUtils.writeScriptBlock(sb, s.toString());
+ ScriptRequestState.writeScriptBlock(sb, s.toString());
}
/**
@@ -465,7 +465,7 @@
protected void writeScriptBlock(AbstractRenderAppender sb)
{
boolean script = false;
- JavaScriptUtils jsu = getJavaScriptUtils((HttpServletRequest)
pageContext.getRequest());
+ ScriptRequestState jsu = getScriptRequestState((HttpServletRequest)
pageContext.getRequest());
boolean writeLegacy = false;
boolean writeName = false;
@@ -497,10 +497,10 @@
if (_codeBlocks != null && _codeBlocks.size() > 0) {
if (!script) {
- JavaScriptUtils.writeScriptStart(sb);
+ ScriptRequestState.writeScriptStart(sb);
script = true;
}
- String s = JavaScriptUtils.getString("codeComment", null);
+ String s = ScriptRequestState.getString("codeComment", null);
sb.append(s);
int cnt = _codeBlocks.size();
for (int i = 0; i < cnt; i++) {
@@ -513,10 +513,10 @@
if (_funcBlocks != null && _funcBlocks.size() > 0) {
if (!script) {
- JavaScriptUtils.writeScriptStart(sb);
+ ScriptRequestState.writeScriptStart(sb);
script = true;
}
- String s = JavaScriptUtils.getString("functionComment", null);
+ String s = ScriptRequestState.getString("functionComment", null);
sb.append(s);
int cnt = _funcBlocks.size();
for (int i = 0; i < cnt; i++) {
@@ -528,7 +528,7 @@
}
if (script)
- JavaScriptUtils.writeScriptEnd(sb);
+ ScriptRequestState.writeScriptEnd(sb);
}
/////////////////////////////////// Private Support
////////////////////////////////////
@@ -562,7 +562,7 @@
String value = map.get(id);
if (idScope != null)
id = idScope + "__" + id;
- String entry = JavaScriptUtils.getString(mapEntry, new
Object[]{id, value});
+ String entry = ScriptRequestState.getString(mapEntry, new
Object[]{id, value});
results.append(entry);
}
return results.toString();
@@ -614,17 +614,17 @@
* with this request. If this doesn't exist, it will be created before it
is
* returned.
* @param request the HttpServletRequest associated with this request
- * @return a <code>JavaScriptUtils</code> assocated with the request
+ * @return a <code>ScriptRequestState</code> assocated with the request
*/
- static public JavaScriptUtils getJavaScriptUtils(ServletRequest request)
+ static public ScriptRequestState getScriptRequestState(ServletRequest
request)
{
assert (request != null);
- JavaScriptUtils jsu = (JavaScriptUtils)
request.getAttribute(JAVASCRIPT_STATUS);
- if (jsu == null) {
- jsu = new JavaScriptUtils();
- request.setAttribute(JAVASCRIPT_STATUS, jsu);
+ ScriptRequestState srs = (ScriptRequestState)
request.getAttribute(JAVASCRIPT_STATUS);
+ if (srs == null) {
+ srs = new ScriptRequestState();
+ request.setAttribute(JAVASCRIPT_STATUS, srs);
}
- assert (jsu != null);
- return jsu;
+ assert (srs != null);
+ return srs;
}
}
Copied:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptRequestState.java
(from r126541,
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/JavaScriptUtils.java)
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptRequestState.java?view=diff&rev=126552&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/JavaScriptUtils.java&r1=126541&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptRequestState.java&r2=126552
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/JavaScriptUtils.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptRequestState.java
Wed Jan 26 14:30:07 2005
@@ -29,7 +29,7 @@
* which contains all of the Java Script. This bundle will be cached inside
this class. THe properties
* file does not get i18n support.
*/
-public class JavaScriptUtils implements Serializable
+public class ScriptRequestState implements Serializable
{
private static final String BUNDLE_NAME =
"org.apache.beehive.netui.tags.javascript.javaScript";
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java?view=diff&rev=126552&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java&r1=126551&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java&r2=126552
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
Wed Jan 26 14:30:07 2005
@@ -27,9 +27,9 @@
import org.apache.beehive.netui.script.ExpressionUpdateException;
import org.apache.beehive.netui.script.IllegalExpressionException;
import org.apache.beehive.netui.tags.*;
-import org.apache.beehive.netui.tags.javascript.JavaScriptUtils;
+import org.apache.beehive.netui.tags.javascript.ScriptRequestState;
import org.apache.beehive.netui.tags.html.HtmlConstants;
-import org.apache.beehive.netui.tags.javascript.JavaScriptUtils;
+import org.apache.beehive.netui.tags.javascript.ScriptRequestState;
import org.apache.beehive.netui.tags.javascript.IScriptReporter;
import org.apache.beehive.netui.tags.javascript.ScriptContainer;
import org.apache.beehive.netui.tags.html.HtmlBaseTag;
@@ -999,7 +999,7 @@
String action = node.getClientAction();
if (action != null) {
action = HtmlUtils.escapeEscapes(action);
- action = JavaScriptUtils.getString("netuiAction", new
Object[]{action});
+ action = ScriptRequestState.getString("netuiAction", new
Object[]{action});
}
_anchorState.onClick = action;
}
@@ -1244,7 +1244,7 @@
}
// without a scripRepoter we need to create the actual JavaScript that
will be written out
- JavaScriptUtils jsu = getJavaScriptUtils((HttpServletRequest)
getPageContext().getRequest());
+ ScriptRequestState jsu = getJavaScriptUtils((HttpServletRequest)
getPageContext().getRequest());
StringBuilder sb = new StringBuilder(128);
StringBuilderRenderAppender writer = new
StringBuilderRenderAppender(sb);
jsu.getTagIdMapping(tagId, realId, null, writer);
@@ -1256,14 +1256,14 @@
* with this request. If this doesn't exist, it will be created before it
is
* returned.
* @param request the HttpServletRequest associated with this request
- * @return a <code>JavaScriptUtils</code> assocated with the request
+ * @return a <code>ScriptRequestState</code> assocated with the request
*/
- static JavaScriptUtils getJavaScriptUtils(ServletRequest request)
+ static ScriptRequestState getJavaScriptUtils(ServletRequest request)
{
assert (request != null);
- JavaScriptUtils jsu = (JavaScriptUtils)
request.getAttribute(ScriptContainer.JAVASCRIPT_STATUS);
+ ScriptRequestState jsu = (ScriptRequestState)
request.getAttribute(ScriptContainer.JAVASCRIPT_STATUS);
if (jsu == null) {
- jsu = new JavaScriptUtils();
+ jsu = new ScriptRequestState();
request.setAttribute(ScriptContainer.JAVASCRIPT_STATUS, jsu);
}
assert (jsu != null);
