Author: dolander Date: Fri Jan 28 20:34:45 2005 New Revision: 149000 URL: http://svn.apache.org/viewcvs?view=rev&rev=149000 Log: Apply consistent code styles and optimize imports using Idea
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClientRequestInterceptor.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IErrorCollector.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/RequestUtils.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanel.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanelCRI.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanelState.java 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/BindingUpdateErrors.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Body.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ConfigurePopup.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.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/HtmlDataSourceTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IHasPopupSupport.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IUrlParams.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.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/Label.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/html/RetrievePopupOutput.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteName.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.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/CoreScriptFeature.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/IScriptReporter.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/javascript/ScriptHeader.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptRequestState.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/ResponseRenderAppender.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TFootTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/ITreeRootElement.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeCRI.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRootElement.java Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java Fri Jan 28 20:34:45 2005 @@ -19,25 +19,23 @@ import org.apache.beehive.netui.core.urls.URLRewriterService; import org.apache.beehive.netui.script.ExpressionEvaluationException; +import org.apache.beehive.netui.tags.javascript.IScriptReporter; import org.apache.beehive.netui.tags.javascript.ScriptContainer; import org.apache.beehive.netui.tags.naming.FormDataNameInterceptor; -import org.apache.beehive.netui.tags.naming.IndexedNameInterceptor; import org.apache.beehive.netui.tags.naming.INameInterceptor; -import org.apache.beehive.netui.tags.javascript.ScriptContainer; -import org.apache.beehive.netui.tags.javascript.IScriptReporter; +import org.apache.beehive.netui.tags.naming.IndexedNameInterceptor; import org.apache.beehive.netui.util.Bundle; import org.apache.beehive.netui.util.logging.Logger; import org.apache.struts.Globals; import org.apache.struts.util.RequestUtils; -import javax.servlet.http.HttpServletRequest; +import javax.servlet.ServletRequest; import javax.servlet.jsp.JspException; import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.BodyTagSupport; import javax.servlet.jsp.tagext.SimpleTagSupport; import javax.servlet.jsp.tagext.Tag; -import javax.servlet.ServletRequest; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClientRequestInterceptor.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClientRequestInterceptor.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClientRequestInterceptor.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClientRequestInterceptor.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClientRequestInterceptor.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClientRequestInterceptor.java Fri Jan 28 20:34:45 2005 @@ -21,14 +21,14 @@ abstract public class AbstractClientRequestInterceptor implements IRequestInterceptor { - protected String getCommand( String cmd, String ctxtPath) + protected String getCommand(String cmd, String ctxtPath) { // catch any runtime errors here and return. try { - cmd = cmd.substring(ctxtPath.length()+1); + cmd = cmd.substring(ctxtPath.length() + 1); int idx = cmd.lastIndexOf('.'); if (idx != -1) { - cmd = cmd.substring(0,idx); + cmd = cmd.substring(0, idx); } } catch (RuntimeException e) { Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java Fri Jan 28 20:34:45 2005 @@ -1,21 +1,20 @@ package org.apache.beehive.netui.tags; import org.apache.beehive.netui.pageflow.util.URLRewriterService; -import org.apache.beehive.netui.util.Bundle; -import org.apache.beehive.netui.util.logging.Logger; -import org.apache.beehive.netui.tags.javascript.ScriptContainer; import org.apache.beehive.netui.tags.html.Html; -import org.apache.beehive.netui.tags.javascript.ScriptContainer; import org.apache.beehive.netui.tags.javascript.IScriptReporter; +import org.apache.beehive.netui.tags.javascript.ScriptContainer; +import org.apache.beehive.netui.util.Bundle; +import org.apache.beehive.netui.util.logging.Logger; import org.apache.struts.Globals; import org.apache.struts.util.RequestUtils; +import javax.servlet.ServletRequest; import javax.servlet.jsp.JspContext; import javax.servlet.jsp.JspException; import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.*; -import javax.servlet.ServletRequest; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IErrorCollector.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IErrorCollector.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IErrorCollector.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IErrorCollector.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IErrorCollector.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IErrorCollector.java Fri Jan 28 20:34:45 2005 @@ -18,7 +18,6 @@ package org.apache.beehive.netui.tags; - /** * An <code>IErrorCollector</code> collects errors generated by the children and reports them. This is used * by container type tags who's children reportErrors. Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/RequestUtils.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/RequestUtils.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/RequestUtils.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/RequestUtils.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/RequestUtils.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/RequestUtils.java Fri Jan 28 20:34:45 2005 @@ -27,27 +27,25 @@ * are the ability to set/get attributes on the outer request (or real request). */ public class RequestUtils - { +{ /** - * * @param req * @param name * @param value */ - public static void setOuterAttribute(HttpServletRequest req,String name,Object value) + public static void setOuterAttribute(HttpServletRequest req, String name, Object value) { ServletRequest realReq = ScopedServletUtils.getOuterRequest(req); - realReq.setAttribute(name,value); + realReq.setAttribute(name, value); } /** - * * @param req * @param name * @return */ - public static Object getOuterAttribute(HttpServletRequest req,String name) + public static Object getOuterAttribute(HttpServletRequest req, String name) { ServletRequest realReq = ScopedServletUtils.getOuterRequest(req); return realReq.getAttribute(name); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanel.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanel.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanel.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanel.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanel.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanel.java Fri Jan 28 20:34:45 2005 @@ -22,10 +22,9 @@ import org.apache.beehive.netui.script.IllegalExpressionException; import org.apache.beehive.netui.tags.AbstractClassicTag; import org.apache.beehive.netui.tags.ExpressionHandling; -import org.apache.beehive.netui.tags.javascript.IScriptReporter; +import org.apache.beehive.netui.tags.javascript.CoreScriptFeature; import org.apache.beehive.netui.tags.javascript.IScriptReporter; import org.apache.beehive.netui.tags.javascript.ScriptRequestState; -import org.apache.beehive.netui.tags.javascript.CoreScriptFeature; import org.apache.beehive.netui.tags.rendering.AbstractHtmlState; import org.apache.beehive.netui.tags.rendering.DivTag; import org.apache.beehive.netui.tags.rendering.TagRenderingBase; @@ -39,10 +38,7 @@ /** * A DivPanel creates an HTML <div> tag that may contain additional <div> tags. There will only * be a single div that is visible at a time. - * - * @jsptagref.tagdescription - * Creates an HTML <div> tag that may contain additional <div> tags. Only a single section will be visible at a time. - * + * @jsptagref.tagdescription Creates an HTML <div> tag that may contain additional <div> tags. Only a single section will be visible at a time. * @netui:tag name="divPanel" * description="A divPanel is an placeholder which may contain multiple sections. Only a single section will be visible at a time." * @netui.tldx:tag whitespace="indent" @@ -61,7 +57,8 @@ public static final String DIVPANEL_DIV_ID = "netui_divpanel_"; - public static String getCurrentPage(ServletRequest req, String tagId) { + public static String getCurrentPage(ServletRequest req, String tagId) + { String reqId = DIVPANEL_DIV_ID + tagId; String page = req.getParameter(reqId); return page; @@ -81,8 +78,7 @@ * Sets an expression which indentifies the DivPanelState which will store the state of the * DivPanel between posts to the server. * @param dataSource - the tree attribute name - * @netui:attribute - * description="Sets an expression which indentifies the DivPanelState storing the state of the + * @netui:attribute description="Sets an expression which indentifies the DivPanelState storing the state of the * DivPanel between posts." * @netui.tldx:attribute language="netuiel" */ @@ -104,12 +100,12 @@ } /** - * Set the ID of the tag. - * @param firstPage - the name of the first page. - * @netui:attribute rtexprvalue="true" - * description="Set the name of the first page to display." - * @netui.tldx:attribute category="general" - */ + * Set the ID of the tag. + * @param firstPage - the name of the first page. + * @netui:attribute rtexprvalue="true" + * description="Set the name of the first page to display." + * @netui.tldx:attribute category="general" + */ public void setFirstPage(String firstPage) { _firstPage = firstPage; @@ -165,7 +161,7 @@ // name the divPanel so we can post state back to this state object. NameService ns = NameService.instance(pageContext.getSession()); - ns.nameObject("DivPanel",state); + ns.nameObject("DivPanel", state); ns.put(state); } } @@ -180,7 +176,7 @@ registerTagError(s, null); reportAndExit(SKIP_BODY); } - srs.writeFeature(sr,writer,CoreScriptFeature.DIVPANEL_INIT,true,false,null); + srs.writeFeature(sr, writer, CoreScriptFeature.DIVPANEL_INIT, true, false, null); // figure out if there is a page to render String page = _firstPage; @@ -201,7 +197,7 @@ _divState.registerAttribute(AbstractHtmlState.ATTR_GENERAL, "netui:divName", state.getObjectname()); TagRenderingBase divRenderer = TagRenderingBase.Factory.getRendering(TagRenderingBase.DIV_TAG, req); - divRenderer.doStartTag(writer,_divState); + divRenderer.doStartTag(writer, _divState); return EVAL_BODY_INCLUDE; } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanelCRI.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanelCRI.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanelCRI.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanelCRI.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanelCRI.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanelCRI.java Fri Jan 28 20:34:45 2005 @@ -17,16 +17,16 @@ */ package org.apache.beehive.netui.tags.divpanel; +import org.apache.beehive.netui.pageflow.requeststate.INameable; import org.apache.beehive.netui.pageflow.requeststate.InterceptorContext; -import org.apache.beehive.netui.pageflow.requeststate.ServletInterceptorContext; import org.apache.beehive.netui.pageflow.requeststate.NameService; -import org.apache.beehive.netui.pageflow.requeststate.INameable; +import org.apache.beehive.netui.pageflow.requeststate.ServletInterceptorContext; import org.apache.beehive.netui.tags.AbstractClientRequestInterceptor; import javax.servlet.http.HttpServletRequest; public class DivPanelCRI extends AbstractClientRequestInterceptor - { +{ private static final String SWITCH_PAGE = "switchPage"; public void interceptRequest(InterceptorContext ctxt) @@ -40,17 +40,17 @@ String uri = request.getRequestURI(); String ctxtPath = request.getContextPath(); - String cmd = getCommand(uri,ctxtPath); + String cmd = getCommand(uri, ctxtPath); // check to see if we handle this command if (SWITCH_PAGE.equals(cmd)) { - handlePageSwitch(ctxt,request); + handlePageSwitch(ctxt, request); } } - private void handlePageSwitch(InterceptorContext ctxt,HttpServletRequest req) + private void handlePageSwitch(InterceptorContext ctxt, HttpServletRequest req) { String dp = req.getParameter("divPanel"); String fp = req.getParameter("firstPage"); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanelState.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanelState.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanelState.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanelState.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanelState.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanelState.java Fri Jan 28 20:34:45 2005 @@ -30,28 +30,30 @@ * Set the ObjectName of the INameable object. This should only * be set once. If it is called a second time an IllegalStateException * should be thrown - * * @param name the Object's name. * @throws IllegalStateException if this method is called more than once for an object */ - public void setObjectName(String name) { + public void setObjectName(String name) + { _name = name; } /** * Returns the ObjectName of the INameable object. - * * @return the ObjectName. */ - public String getObjectname() { + public String getObjectname() + { return _name; } - public String getFirstPage() { + public String getFirstPage() + { return _firstPage; } - public void setFirstPage(String firstPage) { + public void setFirstPage(String firstPage) + { _firstPage = firstPage; } } 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=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java&r2=149000 ============================================================================== --- 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 Fri Jan 28 20:34:45 2005 @@ -4,11 +4,10 @@ import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils; import org.apache.beehive.netui.tags.ByRef; import org.apache.beehive.netui.tags.HtmlUtils; +import org.apache.beehive.netui.tags.internal.PageFlowTagUtils; +import org.apache.beehive.netui.tags.javascript.CoreScriptFeature; import org.apache.beehive.netui.tags.javascript.IScriptReporter; import org.apache.beehive.netui.tags.javascript.ScriptRequestState; -import org.apache.beehive.netui.tags.javascript.ScriptContainer; -import org.apache.beehive.netui.tags.javascript.CoreScriptFeature; -import org.apache.beehive.netui.tags.internal.PageFlowTagUtils; import org.apache.beehive.netui.tags.rendering.*; import org.apache.beehive.netui.util.Bundle; import org.apache.beehive.netui.util.ParamHelper; @@ -180,7 +179,7 @@ { _formSubmit = formSubmit; } - + /** * Sets the popup indicator. * @param popup - whether or not the anchor should open a popup window. @@ -289,7 +288,7 @@ } ParamHelper.addParam(_params, name, value); } - + /** * This method will create the <a> portion of an anchor. It is called by subclasses, for example, the * <code>ImageAnchor</code> relies on this code to generate the <a>. @@ -375,7 +374,7 @@ // are defined. if (tagId != null) { _state.id = tagId; - idScript = renderNameAndId(request,_state, null); + idScript = renderNameAndId(request, _state, null); } // Special case for name anchors @@ -440,7 +439,7 @@ if (_formSubmit && formAction != null) { String realFormName = getFormId(); _state.onClick = ScriptRequestState.getString("anchorFormSubmitAction", - new Object[] {realFormName, _state.href}); + new Object[]{realFormName, _state.href}); if (_form != null) _form.insureRealId(); } @@ -460,7 +459,7 @@ StringBuilderRenderAppender scriptWriter = new StringBuilderRenderAppender(script); if (_formSubmit && formAction != null) - srs.writeFeature(getScriptReporter(), scriptWriter, CoreScriptFeature.ANCHOR_SUBMIT,true,false, + srs.writeFeature(getScriptReporter(), scriptWriter, CoreScriptFeature.ANCHOR_SUBMIT, true, false, null); if (_popupSupport != null) _popupSupport.writeScript(request, srs, getScriptReporter(), scriptWriter); @@ -480,9 +479,8 @@ } _params.put(paramName, paramVal); } - + /** - * * @param req * @param trb * @return @@ -494,8 +492,8 @@ WriteRenderAppender writer = new WriteRenderAppender(pageContext); // the tagId must be qualified and we need to output the lookup methods - _state.id = getIdForTagId(_state.id); - renderDefaultNameAndId((HttpServletRequest) req,_state,_state.id,null); + _state.id = getIdForTagId(_state.id); + renderDefaultNameAndId((HttpServletRequest) req, _state, _state.id, null); //set the name so legacy browsers can support this. _state.name = _state.id; @@ -530,8 +528,8 @@ // if the tagId was set then rewrite it and output it. if (_state.id != null) { - _state.id = getIdForTagId(_state.id); - renderDefaultNameAndId((HttpServletRequest) req,_state,_state.id,null); + _state.id = getIdForTagId(_state.id); + renderDefaultNameAndId((HttpServletRequest) req, _state, _state.id, null); } // write out the tag. Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/BindingUpdateErrors.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/BindingUpdateErrors.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/BindingUpdateErrors.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/BindingUpdateErrors.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/BindingUpdateErrors.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/BindingUpdateErrors.java Fri Jan 28 20:34:45 2005 @@ -18,9 +18,9 @@ package org.apache.beehive.netui.tags.html; import org.apache.beehive.netui.pageflow.ServletContainerAdapter; +import org.apache.beehive.netui.pageflow.internal.AdapterManager; import org.apache.beehive.netui.pageflow.internal.BindingUpdateError; import org.apache.beehive.netui.pageflow.internal.InternalUtils; -import org.apache.beehive.netui.pageflow.internal.AdapterManager; import org.apache.beehive.netui.tags.AbstractSimpleTag; import org.apache.beehive.netui.util.Bundle; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Body.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Body.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Body.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Body.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Body.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Body.java Fri Jan 28 20:34:45 2005 @@ -19,15 +19,13 @@ import org.apache.beehive.netui.tags.ErrorHandling; import org.apache.beehive.netui.tags.javascript.IScriptReporter; -import org.apache.beehive.netui.tags.javascript.IScriptReporter; import org.apache.beehive.netui.tags.rendering.AbstractHtmlState; import org.apache.beehive.netui.tags.rendering.BodyTag; import org.apache.beehive.netui.tags.rendering.TagRenderingBase; import org.apache.beehive.netui.tags.rendering.WriteRenderAppender; -import org.apache.beehive.netui.util.Bundle; -import javax.servlet.jsp.JspException; import javax.servlet.http.HttpServletRequest; +import javax.servlet.jsp.JspException; /** * @jsptagref.tagdescription <p> @@ -189,7 +187,7 @@ { // we assume that tagId will over have override id if both are defined. if (_state.id != null) { - _idScript = renderNameAndId((HttpServletRequest) pageContext.getRequest(),_state, null); + _idScript = renderNameAndId((HttpServletRequest) pageContext.getRequest(), _state, null); } // render the header... Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java Fri Jan 28 20:34:45 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.tags.html; import org.apache.beehive.netui.core.urls.URLRewriterService; +import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils; import org.apache.beehive.netui.tags.ByRef; import org.apache.beehive.netui.tags.HtmlUtils; import org.apache.beehive.netui.tags.IHtmlAccessable; @@ -28,7 +29,6 @@ import org.apache.beehive.netui.tags.rendering.WriteRenderAppender; import org.apache.beehive.netui.util.Bundle; import org.apache.beehive.netui.util.ParamHelper; -import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils; import org.apache.struts.taglib.html.Constants; import javax.servlet.http.HttpServletRequest; @@ -130,7 +130,7 @@ { _action = setRequiredValueAttribute(action, "action"); } - + /** * Set the target "scope" for the button's action. Multiple active page flows may exist concurrently within named * scopes. This attribute selects which named scope to use. If omitted, the default scope is assumed. @@ -274,7 +274,7 @@ } _params.put(ScopedServletUtils.SCOPE_ID_PARAM, _targetScope); } - + String overrideAction = ACTION_OVERRIDE + _action; overrideAction = HtmlUtils.addParams(overrideAction, _params, response.getCharacterEncoding()); String buttonOutput = URLRewriterService.rewriteName(pageContext.getServletContext(), @@ -286,7 +286,7 @@ // don't write the id attribute Form parentForm = getNearestForm(); - idScript = renderNameAndId(request,_state, parentForm); + idScript = renderNameAndId(request, _state, parentForm); } else { // set the error because the action is invalid @@ -294,7 +294,7 @@ } } else { - idScript = renderNameAndId(request,_state, null); + idScript = renderNameAndId(request, _state, null); } // report any errors that may have been generated. Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ConfigurePopup.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ConfigurePopup.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ConfigurePopup.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ConfigurePopup.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ConfigurePopup.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ConfigurePopup.java Fri Jan 28 20:34:45 2005 @@ -17,8 +17,8 @@ */ package org.apache.beehive.netui.tags.html; -import org.apache.beehive.netui.util.Bundle; import org.apache.beehive.netui.tags.AbstractClassicTag; +import org.apache.beehive.netui.util.Bundle; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.JspTag; @@ -28,9 +28,7 @@ /** * Configures popup window parameters for parent tags that can open popup windows. * @jsptagref.tagdescription Configures popup window parameters for parent tags that can open popup windows. - * @example - * - * <pre> + * @example <pre> * <netui:anchor action="getCityZipFromNestedPageFlow" popup="true"> * Get a city and zip code * <netui:configurePopup resizable="false" width="400" height="200"> @@ -63,7 +61,7 @@ private boolean _replace = false; private String _popupFunc; private String _onPopupDone; - + /** * Return the name of the Tag. */ @@ -71,7 +69,7 @@ { return "ConfigurePopup"; } - + /** * Sets the JavaScript function to be called when the popup window is closing. If this attribute is not present, * a default function will be generated. @@ -86,7 +84,7 @@ { _onPopupDone = onPopupDone; } - + /** * Sets the JavaScript function to be called to open the popup window. This function overrides the auto-generated * one that is based on the other attributes like <code>resizable</code>, <code>name</code>, etc. @@ -101,7 +99,7 @@ { _popupFunc = popupFunc; } - + /** * Sets the name of the popup window. * @param name - the name of the popup window. @@ -115,7 +113,7 @@ { _name = name; } - + /** * Sets whether the toolbar is visible in the popup window. * @param toolbar - whether the toolbar is visible in the popup window. @@ -129,7 +127,7 @@ { _toolbar = toolbar; } - + /** * Sets whether the location (address) bar is visible in the popup window. * @param location - whether the location (address) bar is visible in the popup window. @@ -143,7 +141,7 @@ { _location = location; } - + /** * Sets whether directory buttons are displayed in the popup window. * @param directories - whether directory buttons are displayed in the popup window. @@ -157,7 +155,7 @@ { _directories = directories; } - + /** * Sets whether the status bar is displayed in the popup window. * @param status - whether the status bar is displayed in the popup window. @@ -171,7 +169,7 @@ { _status = status; } - + /** * Sets whether the menu bar is displayed in the popup window. * @param menubar - whether the menu bar is displayed in the popup window. @@ -185,7 +183,7 @@ { _menubar = menubar; } - + /** * Sets whether the popup window has scroll bars. * @param scrollbars - whether the popup window has scroll bars. @@ -199,7 +197,7 @@ { _scrollbars = scrollbars; } - + /** * Sets whether the popup window is resizable. * @param resizable - whether the popup window is resizable. @@ -213,7 +211,7 @@ { _resizable = resizable; } - + /** * Sets the width of the popup window. * @param width - the width of the popup window. @@ -227,7 +225,7 @@ { _width = width; } - + /** * Sets the height of the popup window. * @param height - the height of the popup window. @@ -241,7 +239,7 @@ { _height = height; } - + /** * Sets the X coordinate of the top left corner of the popup window. * @param left - the X coordinate of the top left corner of the popup window. @@ -255,7 +253,7 @@ { _left = left; } - + /** * Sets the Y coordinate of the top left corner of the popup window. * @param top - the Y coordinate of the top left corner of the popup window. @@ -269,7 +267,7 @@ { _top = top; } - + /** * Sets whether the popup window's location will replace the location in the current window's navigation history. * @param replace - whether the popup window's location will replace the location in the current window's navigation history. @@ -283,7 +281,7 @@ { _replace = replace; } - + /** * @throws JspException if a JSP exception has occurred */ @@ -328,7 +326,7 @@ popupSupport.setOnPopupDone(_onPopupDone); } } - + localRelease(); return EVAL_BODY_INCLUDE; } @@ -353,8 +351,8 @@ _replace = false; _popupFunc = null; _onPopupDone = null; - + super.localRelease(); } - + } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java Fri Jan 28 20:34:45 2005 @@ -74,7 +74,6 @@ /** * Set the key under which the error was stored (often the name of the form bean property associated with the error). - * @deprecated Use [EMAIL PROTECTED] #setKey} instead. * @param value - the key under which the error was stored * @jsptagref.attributedescription The key under which the error was stored (often the name of the form bean property associated with the error) * @jsptagref.databindable Read Only @@ -82,13 +81,14 @@ * @netui:attribute required="false" rtexprvalue="true" * description="The key under which the error was stored (often the name of the form bean property associated with the error)" * @netui.tldx:attribute + * @deprecated Use [EMAIL PROTECTED] #setKey} instead. */ public void setValue(String value) throws JspException { setKey(value); } - + /** * Set the key under which the error was stored (often the name of the form bean property associated with the error). * @param key - the key under which the error was stored Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java Fri Jan 28 20:34:45 2005 @@ -36,8 +36,8 @@ import javax.servlet.jsp.JspException; import javax.servlet.jsp.PageContext; import javax.servlet.jsp.el.ELException; -import java.util.Locale; import java.text.MessageFormat; +import java.util.Locale; abstract public class ErrorBaseTag extends AbstractSimpleTag { @@ -65,17 +65,17 @@ * Set the name of the message bundle, as defined in the page flow's * [EMAIL PROTECTED] org.apache.beehive.netui.pageflow.annotations.Jpf.MessageBundle} annotation, where the error messages * can be found. If this attribute is not set, the page flow's default message bundle is used. - * @deprecated Use [EMAIL PROTECTED] #setBundleName} instead. * @param bundle - the bundle name * @netui:attribute required="false" rtexprvalue="true" * description="The name of the message bundle, as defined in the page flow's Jpf.MessageBundle annotation." + * @deprecated Use [EMAIL PROTECTED] #setBundleName} instead. */ public final void setBundle(String bundle) throws JspException { setBundleName(bundle); } - + /** * Set the name of the message bundle, as defined in the page flow's * [EMAIL PROTECTED] org.apache.beehive.netui.pageflow.annotations.Jpf.MessageBundle} annotation, where the error messages 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=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java&r2=149000 ============================================================================== --- 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 Fri Jan 28 20:34:45 2005 @@ -21,17 +21,16 @@ import org.apache.beehive.netui.core.urls.URLRewriterService; import org.apache.beehive.netui.pageflow.FlowController; import org.apache.beehive.netui.pageflow.PageFlowUtils; -import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils; import org.apache.beehive.netui.pageflow.internal.ContextCache; import org.apache.beehive.netui.pageflow.internal.InternalConstants; import org.apache.beehive.netui.pageflow.internal.InternalUtils; +import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils; import org.apache.beehive.netui.script.common.ImplicitObjectUtil; import org.apache.beehive.netui.tags.TagConfig; +import org.apache.beehive.netui.tags.internal.PageFlowTagUtils; +import org.apache.beehive.netui.tags.javascript.CoreScriptFeature; import org.apache.beehive.netui.tags.javascript.IScriptReporter; import org.apache.beehive.netui.tags.javascript.ScriptRequestState; -import org.apache.beehive.netui.tags.javascript.ScriptContainer; -import org.apache.beehive.netui.tags.javascript.CoreScriptFeature; -import org.apache.beehive.netui.tags.internal.PageFlowTagUtils; import org.apache.beehive.netui.tags.rendering.*; import org.apache.beehive.netui.util.Bundle; import org.apache.beehive.netui.util.ParamHelper; @@ -409,7 +408,7 @@ // @todo: we need to verify what happens if this is null and type is set. _state.name = setRequiredValueAttribute(name, "name"); } - + /** * Set the target "scope" for the form's action. Multiple active page flows may exist concurrently within named * scopes. This attribute selects which named scope to use. If omitted, the default scope is assumed. @@ -425,7 +424,7 @@ { _targetScope = targetScope; } - + /** * Sets the onReset javascript event. * @param onReset - the onReset event. @@ -759,7 +758,7 @@ actionUrl.removeParameter(ScopedServletUtils.SCOPE_ID_PARAM); } } - + HttpServletResponse response = (HttpServletResponse) pageContext.getResponse(); if (actionUrl != null) { _state.action = response.encodeURL(actionUrl.toString()); @@ -843,7 +842,7 @@ if (_formSubmit) { ScriptRequestState srs = ScriptRequestState.getScriptRequestState(request); - srs.writeFeature(getScriptReporter(), writer, CoreScriptFeature.ANCHOR_SUBMIT,true,false, null); + srs.writeFeature(getScriptReporter(), writer, CoreScriptFeature.ANCHOR_SUBMIT, true, false, null); } // output any generated javascript 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=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java&r2=149000 ============================================================================== --- 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 Fri Jan 28 20:34:45 2005 @@ -17,16 +17,15 @@ */ package org.apache.beehive.netui.tags.html; -import org.apache.beehive.netui.tags.*; +import org.apache.beehive.netui.tags.AbstractClassicTag; +import org.apache.beehive.netui.tags.IAttributeConsumer; +import org.apache.beehive.netui.tags.IHtmlAttrs; +import org.apache.beehive.netui.tags.TagConfig; 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; import org.apache.beehive.netui.tags.rendering.AbstractHtmlState; -import org.apache.beehive.netui.tags.rendering.StringBuilderRenderAppender; import org.apache.beehive.netui.util.Bundle; -import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.Tag; @@ -129,7 +128,7 @@ * <p>The second parameter ensures that the JavaScript function * begins its search within the correct Portlet scope. Pass the * JavaScript keyword <code>this</code> as the second parameter. - * + * * For detailed information on using the function * <code>getNetuiTagName( tagId, tag )</code> see * <a href="[EMAIL PROTECTED]/../guide/netui/guide/conUsingJavaScript.html"> @@ -422,7 +421,8 @@ if (name.equals(CLASS)) { tsh.styleClass = value; return; - } else if (name.equals(STYLE)) { + } + else if (name.equals(STYLE)) { tsh.style = value; return; } @@ -475,7 +475,7 @@ * @param parentForm * @return */ - protected final String renderNameAndId(HttpServletRequest request,AbstractHtmlState state, Form parentForm) + protected final String renderNameAndId(HttpServletRequest request, AbstractHtmlState state, Form parentForm) { // if id is not set then we need to exit if (state.id == null) @@ -500,7 +500,8 @@ ScriptRequestState srs = ScriptRequestState.getScriptRequestState(request); if (!ctrlState) { idScript = srs.mapLegacyTagId(getScriptReporter(), id, state.id); - } else { + } + else { AbstractHtmlControlState cState = (AbstractHtmlControlState) state; if (cState.name != null) idScript = srs.mapLegacyTagId(getScriptReporter(), id, cState.name); @@ -516,11 +517,12 @@ name = cState.name; } - String script = renderDefaultNameAndId((HttpServletRequest) pageContext.getRequest(),state, id, name); + String script = renderDefaultNameAndId((HttpServletRequest) pageContext.getRequest(), state, id, name); if (script != null) { if (idScript != null) { idScript = idScript + script; - } else { + } + else { idScript = script; } } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDataSourceTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDataSourceTag.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDataSourceTag.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDataSourceTag.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDataSourceTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDataSourceTag.java Fri Jan 28 20:34:45 2005 @@ -22,8 +22,8 @@ import org.apache.beehive.netui.tags.ExpressionHandling; import org.apache.beehive.netui.tags.rendering.AbstractHtmlControlState; -import javax.servlet.jsp.JspException; import javax.servlet.http.HttpServletRequest; +import javax.servlet.jsp.JspException; import java.util.List; /** @@ -140,7 +140,7 @@ state.name = applyNamingChain(datasource); Form parentForm = getNearestForm(); - String idScript = renderNameAndId((HttpServletRequest) pageContext.getRequest(),state, parentForm); + String idScript = renderNameAndId((HttpServletRequest) pageContext.getRequest(), state, parentForm); if (idScript != null) javaScript.setRef(idScript); } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IHasPopupSupport.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IHasPopupSupport.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IHasPopupSupport.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IHasPopupSupport.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IHasPopupSupport.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IHasPopupSupport.java Fri Jan 28 20:34:45 2005 @@ -21,11 +21,11 @@ { /** * Enable popup support. - */ + */ public void setPopup(boolean popup); - + /** * Get a helper to provide popup support. - */ + */ public PopupSupport getPopupSupport(); } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IUrlParams.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IUrlParams.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IUrlParams.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IUrlParams.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IUrlParams.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IUrlParams.java Fri Jan 28 20:34:45 2005 @@ -30,7 +30,7 @@ * This method will allow a tag that produces one or more Urls to have parameters set * on the tag. The name and value should be required. The facet is optional, and * allows tags producing more than one URL to have parameters set on different URLs. - * @param name The name of the parameter to be added to the URL. + * @param name The name of the parameter to be added to the URL. * @param value The value of the parameter. * @param facet The name of a facet for which the parameter should be added. * @throws JspException Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java Fri Jan 28 20:34:45 2005 @@ -27,8 +27,8 @@ import org.apache.beehive.netui.util.ParamHelper; import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.JspException; import java.net.URISyntaxException; import java.util.HashMap; @@ -327,7 +327,7 @@ // @todo: should we move the tagId stuff to the base class? //String tagId = getTagId(); if (_state.id != null) { - scriptId = renderNameAndId((HttpServletRequest) req,_state, null); + scriptId = renderNameAndId((HttpServletRequest) req, _state, null); } WriteRenderAppender writer = new WriteRenderAppender(pageContext); 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=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageAnchor.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageAnchor.java&r2=149000 ============================================================================== --- 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 Fri Jan 28 20:34:45 2005 @@ -20,10 +20,9 @@ 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.ScriptRequestState; -import org.apache.beehive.netui.tags.javascript.ScriptContainer; -import org.apache.beehive.netui.tags.javascript.CoreScriptFeature; import org.apache.beehive.netui.tags.internal.PageFlowTagUtils; +import org.apache.beehive.netui.tags.javascript.CoreScriptFeature; +import org.apache.beehive.netui.tags.javascript.ScriptRequestState; import org.apache.beehive.netui.tags.rendering.AbstractHtmlState; import org.apache.beehive.netui.tags.rendering.ImageTag; import org.apache.beehive.netui.tags.rendering.TagRenderingBase; @@ -376,7 +375,7 @@ // cause the roll over script to be inserted WriteRenderAppender writer = new WriteRenderAppender(pageContext); ScriptRequestState srs = ScriptRequestState.getScriptRequestState((HttpServletRequest) pageContext.getRequest()); - srs.writeFeature(getScriptReporter(), writer, CoreScriptFeature.ROLLOVER,true,false, null); + srs.writeFeature(getScriptReporter(), writer, CoreScriptFeature.ROLLOVER, true, false, null); } return EVAL_BODY_BUFFERED; 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=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java&r2=149000 ============================================================================== --- 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 Fri Jan 28 20:34:45 2005 @@ -19,10 +19,9 @@ import org.apache.beehive.netui.core.urls.MutableURI; import org.apache.beehive.netui.tags.IHtmlAccessable; -import org.apache.beehive.netui.tags.javascript.ScriptRequestState; -import org.apache.beehive.netui.tags.javascript.ScriptContainer; -import org.apache.beehive.netui.tags.javascript.CoreScriptFeature; import org.apache.beehive.netui.tags.internal.PageFlowTagUtils; +import org.apache.beehive.netui.tags.javascript.CoreScriptFeature; +import org.apache.beehive.netui.tags.javascript.ScriptRequestState; import org.apache.beehive.netui.tags.rendering.AbstractHtmlState; import org.apache.beehive.netui.tags.rendering.InputImageTag; import org.apache.beehive.netui.tags.rendering.TagRenderingBase; @@ -267,7 +266,7 @@ // cause the roll over script to be inserted ScriptRequestState srs = ScriptRequestState.getScriptRequestState((HttpServletRequest) pageContext.getRequest()); WriteRenderAppender writer = new WriteRenderAppender(pageContext); - srs.writeFeature(getScriptReporter(), writer, CoreScriptFeature.ROLLOVER,true,false, null); + srs.writeFeature(getScriptReporter(), writer, CoreScriptFeature.ROLLOVER, true, false, null); } return EVAL_BODY_BUFFERED; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java Fri Jan 28 20:34:45 2005 @@ -116,7 +116,7 @@ // are defined. //String tagId = getTagId(); if (_state.id != null) { - scriptId = renderNameAndId((HttpServletRequest) req,_state, null); + scriptId = renderNameAndId((HttpServletRequest) req, _state, null); } if (hasErrors()) 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=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/PopupSupport.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/PopupSupport.java&r2=149000 ============================================================================== --- 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 Fri Jan 28 20:34:45 2005 @@ -18,15 +18,15 @@ package org.apache.beehive.netui.tags.html; import org.apache.beehive.netui.pageflow.internal.InternalConstants; +import org.apache.beehive.netui.tags.AbstractClassicTag; import org.apache.beehive.netui.tags.internal.ReturnActionViewRenderer; +import org.apache.beehive.netui.tags.javascript.CoreScriptFeature; import org.apache.beehive.netui.tags.javascript.IScriptReporter; -import org.apache.beehive.netui.tags.AbstractClassicTag; import org.apache.beehive.netui.tags.javascript.ScriptRequestState; -import org.apache.beehive.netui.tags.javascript.CoreScriptFeature; import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender; -import javax.servlet.jsp.JspException; import javax.servlet.ServletRequest; +import javax.servlet.jsp.JspException; import java.util.HashMap; import java.util.Map; @@ -34,14 +34,14 @@ { private static final String VIEW_RENDERER_CLASS_NAME = ReturnActionViewRenderer.class.getName(); private static final String ON_POPUP_DONE_FUNC = "Netui_OnPopupDone_"; - + private String _name = ""; private HashMap _features; private boolean _replace = false; private String _onPopupDone; private String _popupFunc; - public void setName( String name ) + public void setName(String name) { _name = name; } @@ -101,34 +101,34 @@ putFeature("top", top); } - public void setReplace( boolean replace ) + public void setReplace(boolean replace) { _replace = replace; } - public void setOnPopupDone( String onPopupDone ) + public void setOnPopupDone(String onPopupDone) { _onPopupDone = onPopupDone; } - public void setPopupFunc( String popupFunc ) + public void setPopupFunc(String popupFunc) { _popupFunc = popupFunc; } public String getOnClick(String url) { - if ( _popupFunc != null ) { + if (_popupFunc != null) { return ScriptRequestState.getString("popupSupportOnClickCustom", new Object[]{_popupFunc}); } else { StringBuilder features = new StringBuilder(); - + if (_features != null) { boolean firstOne = true; for (Object i : _features.entrySet()) { Map.Entry entry = (Map.Entry) i; - if (! firstOne) { + if (!firstOne) { features.append(','); } features.append(entry.getKey()); @@ -137,14 +137,14 @@ firstOne = false; } } - + Object[] args = new Object[]{url, _name, features.toString(), _replace}; return ScriptRequestState.getString("popupSupportOnClick", args); } } - + public void addParams(IUrlParams urlParams, ServletRequest request) - throws JspException + throws JspException { urlParams.addParameter(InternalConstants.RETURN_ACTION_VIEW_RENDERER_PARAM, VIEW_RENDERER_CLASS_NAME, null); if (_onPopupDone == null) { @@ -152,7 +152,7 @@ } urlParams.addParameter(ReturnActionViewRenderer.getCallbackParamName(), _onPopupDone, null); } - + /** * This method will generate the next unique int within this request. * @param req the Request @@ -169,7 +169,7 @@ req.setAttribute(AbstractClassicTag.NETUI_UNIQUE_CNT, new Integer(ret + 1)); return ret; } - + public void writeScript(ServletRequest req, ScriptRequestState srs, IScriptReporter scriptReporter, AbstractRenderAppender results) { // Write the generic function for popping a window. @@ -177,14 +177,14 @@ // Write the callback that's triggered when the popup window is closing. assert (_onPopupDone != null); // addParams() should ensure that this isn't null - srs.writeFeature(scriptReporter,results, "popupSupportOnPopupDone", new Object[]{_onPopupDone}); + srs.writeFeature(scriptReporter, results, "popupSupportOnPopupDone", new Object[]{_onPopupDone}); } - + private void putFeature(String featureName, boolean val) { putFeature(featureName, val ? 1 : 0); } - + private void putFeature(String featureName, Object val) { if (_features == null) { Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RetrievePopupOutput.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RetrievePopupOutput.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RetrievePopupOutput.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RetrievePopupOutput.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RetrievePopupOutput.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RetrievePopupOutput.java Fri Jan 28 20:34:45 2005 @@ -17,9 +17,9 @@ */ package org.apache.beehive.netui.tags.html; -import org.apache.beehive.netui.util.Bundle; import org.apache.beehive.netui.tags.AbstractClassicTag; import org.apache.beehive.netui.tags.internal.ReturnActionViewRenderer; +import org.apache.beehive.netui.util.Bundle; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.JspTag; @@ -29,9 +29,7 @@ /** * Causes a value to be retrieved when a popup window closes. * @jsptagref.tagdescription Causes a value to be retrieved when a popup window closes. - * @example - * - * <pre> + * @example <pre> * <netui:anchor action="getCityZipFromNestedPageFlow" popup="true"> * Get a city and zip code * <netui:configurePopup resizable="false" width="400" height="200"> @@ -106,8 +104,8 @@ { IUrlParams urlParams = (IUrlParams) parentParent; urlParams.addParameter(ReturnActionViewRenderer.getMapItemParamName(), - _dataSource + ReturnActionViewRenderer.getDelim() + _tagIdRef, - null); + _dataSource + ReturnActionViewRenderer.getDelim() + _tagIdRef, + null); } } localRelease(); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteName.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteName.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteName.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteName.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteName.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteName.java Fri Jan 28 20:34:45 2005 @@ -21,10 +21,9 @@ import org.apache.beehive.netui.tags.TagConfig; import org.apache.beehive.netui.tags.javascript.IScriptReporter; import org.apache.beehive.netui.tags.javascript.ScriptRequestState; -import org.apache.beehive.netui.tags.javascript.ScriptContainer; -import javax.servlet.jsp.JspException; import javax.servlet.http.HttpServletRequest; +import javax.servlet.jsp.JspException; /** * Allow a name, typically either an <code>id</code> or <code>name</code> attribute, to participate in URL Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java Fri Jan 28 20:34:45 2005 @@ -276,7 +276,7 @@ // we assume that tagId will over have override id if both // are defined. if (_state.id != null) { - scriptId = renderNameAndId((HttpServletRequest) req,_state, null); + scriptId = renderNameAndId((HttpServletRequest) req, _state, null); } _state.disabled = _disabled; 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=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/ReturnActionViewRenderer.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/ReturnActionViewRenderer.java&r2=149000 ============================================================================== --- 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 Fri Jan 28 20:34:45 2005 @@ -24,7 +24,6 @@ import org.apache.beehive.netui.tags.rendering.ResponseRenderAppender; import org.apache.beehive.netui.tags.rendering.ScriptTag; import org.apache.beehive.netui.tags.rendering.TagRenderingBase; -import org.apache.beehive.netui.tags.javascript.ScriptRequestState; import org.apache.beehive.netui.util.logging.Logger; import javax.servlet.ServletContext; @@ -41,45 +40,45 @@ /** * Renderer for the "automatic" script-only page that is produced to send a map of values from a popup window * back to the opener, and to close the popup window. - */ + */ public class ReturnActionViewRenderer - implements ViewRenderer, Serializable + implements ViewRenderer, Serializable { private static final Logger _log = Logger.getInstance(ReturnActionViewRenderer.class); - + private static char DELIM = ':'; private static String ITEM_PARAM = InternalConstants.ATTR_PREFIX + "retrieveItem"; private static String CALLBACK_PARAM = InternalConstants.ATTR_PREFIX + "returnActionCallback"; - + private HashMap _retrieveMap; private String _callbackFunc; - + public static char getDelim() { return DELIM; } - + public static String getMapItemParamName() { return ITEM_PARAM; } - + public static String getCallbackParamName() { return CALLBACK_PARAM; } - + /** * Initialize, based on request parameters we're looking for. - */ - public void init( ServletRequest request ) + */ + public void init(ServletRequest request) { String[] vals = request.getParameterValues(ITEM_PARAM); - - if ( vals != null ) { + + if (vals != null) { _retrieveMap = new HashMap(); - - for ( int i = 0; i < vals.length; i++ ) { + + for (int i = 0; i < vals.length; i++) { String val = vals[i]; int delimPos = val.indexOf(DELIM); if (delimPos != -1) { @@ -89,45 +88,43 @@ } } } - + _callbackFunc = request.getParameter(CALLBACK_PARAM); } // $todo: JavaScript? - public void renderView( ServletRequest request, ServletResponse response, ServletContext servletContext ) + public void renderView(ServletRequest request, ServletResponse response, ServletContext servletContext) throws IOException { ResponseRenderAppender appender = new ResponseRenderAppender(response); ScriptTag.State state = new ScriptTag.State(); ScriptTag br = (ScriptTag) TagRenderingBase.Factory.getRendering(TagRenderingBase.SCRIPT_TAG, request); state.suppressComments = false; - br.doStartTag(appender,state); + br.doStartTag(appender, state); appender.append(ScriptRequestState.getString("popupReturn_begin", null)); assert request instanceof HttpServletRequest : request.getClass().getName(); HttpServletRequest httpRequest = (HttpServletRequest) request; - + if (_retrieveMap != null) { - for ( Iterator<Map.Entry> i = _retrieveMap.entrySet().iterator(); i.hasNext(); ) { + for (Iterator<Map.Entry> i = _retrieveMap.entrySet().iterator(); i.hasNext();) { Map.Entry entry = i.next(); String fieldID = (String) entry.getKey(); String expressionToRetrieve = "${" + (String) entry.getValue() + '}'; - try - { + try { String value = InternalExpressionUtils.evaluateMessage(expressionToRetrieve, null, httpRequest, servletContext); String item = ScriptRequestState.getString("popupReturn_item", new Object[]{fieldID, value}); appender.append(item); } - catch (ELException e) - { + catch (ELException e) { _log.error("Error evaluating expression " + expressionToRetrieve, e); } } } - - appender.append(ScriptRequestState.getString("popupReturn_end", new Object[]{ _callbackFunc} )); + + appender.append(ScriptRequestState.getString("popupReturn_end", new Object[]{_callbackFunc})); br.doEndTag(appender, false); } } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/CoreScriptFeature.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/CoreScriptFeature.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/CoreScriptFeature.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/CoreScriptFeature.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/CoreScriptFeature.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/CoreScriptFeature.java Fri Jan 28 20:34:45 2005 @@ -41,7 +41,7 @@ SET_FOCUS (0x10000001); public int value; - + CoreScriptFeature(int val) { value = val; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/IScriptReporter.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/IScriptReporter.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/IScriptReporter.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/IScriptReporter.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/IScriptReporter.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/IScriptReporter.java Fri Jan 28 20:34:45 2005 @@ -31,7 +31,7 @@ /** * This method will add Script as a function. * @param placement - * @param script the text of the function. This value must not be null. + * @param script the text of the function. This value must not be null. */ void addScriptFunction(ScriptPlacement placement, String script); @@ -45,7 +45,6 @@ void addLegacyTagIdMappings(String tagId, String tagName); /** - * * @param tagId * @param realId * @param realName 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=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptBlock.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptBlock.java&r2=149000 ============================================================================== --- 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 Fri Jan 28 20:34:45 2005 @@ -83,11 +83,11 @@ IScriptReporter sr = getScriptReporter(); // if we are writting the javaScript inline then do it.... - if (_placement == ScriptPlacement.PLACE_INLINE|| sr == null) { - ScriptRequestState.writeScriptBlock(pageContext.getRequest(),writer,script); + if (_placement == ScriptPlacement.PLACE_INLINE || sr == null) { + ScriptRequestState.writeScriptBlock(pageContext.getRequest(), writer, script); return; } - sr.addScriptFunction(_placement,script); + sr.addScriptFunction(_placement, script); } } 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=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptContainer.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptContainer.java&r2=149000 ============================================================================== --- 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 Fri Jan 28 20:34:45 2005 @@ -20,9 +20,9 @@ import org.apache.beehive.netui.tags.AbstractClassicTag; import org.apache.beehive.netui.tags.TagConfig; import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender; -import org.apache.beehive.netui.tags.rendering.WriteRenderAppender; import org.apache.beehive.netui.tags.rendering.ScriptTag; import org.apache.beehive.netui.tags.rendering.TagRenderingBase; +import org.apache.beehive.netui.tags.rendering.WriteRenderAppender; import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.JspException; @@ -72,8 +72,8 @@ private ArrayList<String> _funcBlocks; private ArrayList<String> _codeBefore; private ArrayList<String> _codeAfter; - private HashMap<String,String> _idMap; - private HashMap<String,String> _idToNameMap; + private HashMap<String, String> _idMap; + private HashMap<String, String> _idToNameMap; private boolean _genScope = false; //private boolean _runAtClient = false; private boolean _writeScript = false; @@ -92,7 +92,7 @@ /** * This method will add Script as a function. * @param placement - * @param script the text of the function. This value must not be null. + * @param script the text of the function. This value must not be null. */ public void addScriptFunction(ScriptPlacement placement, String script) { @@ -132,7 +132,7 @@ assert (tagName != null) : "The parameter 'tagName' must not be null"; if (_idMap == null) { - _idMap = new HashMap<String,String>(); + _idMap = new HashMap<String, String>(); } assert (_idMap != null) : "_idMap should not be null"; @@ -154,7 +154,7 @@ if (realName != null) { if (_idToNameMap == null) - _idToNameMap = new HashMap<String,String>(); + _idToNameMap = new HashMap<String, String>(); _idToNameMap.put(tagId, realName); } } @@ -285,7 +285,7 @@ s.append(code); s.append("\n"); } - ScriptRequestState.writeScriptBlock(pageContext.getRequest(),sb, s.toString()); + ScriptRequestState.writeScriptBlock(pageContext.getRequest(), sb, s.toString()); } @@ -299,7 +299,7 @@ s.append(code); s.append("\n"); } - ScriptRequestState.writeScriptBlock(pageContext.getRequest(),sb, s.toString()); + ScriptRequestState.writeScriptBlock(pageContext.getRequest(), sb, s.toString()); } /** @@ -347,7 +347,7 @@ //@todo: test compat sb.append("\n\n"); br = (ScriptTag) TagRenderingBase.Factory.getRendering(TagRenderingBase.SCRIPT_TAG, pageContext.getRequest()); - br.doStartTag(sb,state); + br.doStartTag(sb, state); script = true; } String s = ScriptRequestState.getString("functionComment", null); @@ -362,8 +362,8 @@ } if (script) { - assert(br!=null); - br.doEndTag(sb,false); + assert(br != null); + br.doEndTag(sb, false); //@todo: test compat sb.append("\n\n"); } @@ -404,7 +404,7 @@ return idScope; } - private String processIdMap(HashMap<String,String> map, String mapEntry, String idScope) + private String processIdMap(HashMap<String, String> map, String mapEntry, String idScope) { // if no map or empty then return if (map == null || map.size() == 0) Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptHeader.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptHeader.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptHeader.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptHeader.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptHeader.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptHeader.java Fri Jan 28 20:34:45 2005 @@ -18,9 +18,9 @@ package org.apache.beehive.netui.tags.javascript; import org.apache.beehive.netui.tags.AbstractClassicTag; -import org.apache.beehive.netui.tags.rendering.WriteRenderAppender; import org.apache.beehive.netui.tags.rendering.ScriptTag; import org.apache.beehive.netui.tags.rendering.TagRenderingBase; +import org.apache.beehive.netui.tags.rendering.WriteRenderAppender; import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.JspException; @@ -53,13 +53,14 @@ // write out the dynamic content WriteRenderAppender writer = new WriteRenderAppender(pageContext); ScriptRequestState srs = ScriptRequestState.getScriptRequestState(req); - srs.writeFeature(sr,writer,CoreScriptFeature.DYNAMIC_INIT, true, false,new Object[]{req.getContextPath()}); + srs.writeFeature(sr, writer, CoreScriptFeature.DYNAMIC_INIT, true, false, new Object[]{req.getContextPath()}); // write out the include ScriptTag.State state = new ScriptTag.State(); - TagRenderingBase br = TagRenderingBase.Factory.getRendering(TagRenderingBase.SCRIPT_TAG, pageContext.getRequest());; + TagRenderingBase br = TagRenderingBase.Factory.getRendering(TagRenderingBase.SCRIPT_TAG, pageContext.getRequest()); + ; state.src = req.getContextPath() + "/resources/beehive/version1/javascript/netui-tree.js"; - br.doStartTag(writer,state); + br.doStartTag(writer, state); br.doEndTag(writer); return EVAL_BODY_INCLUDE; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptRequestState.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=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptRequestState.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptRequestState.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptRequestState.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptRequestState.java Fri Jan 28 20:34:45 2005 @@ -17,9 +17,12 @@ */ package org.apache.beehive.netui.tags.javascript; -import org.apache.beehive.netui.tags.TagConfig; import org.apache.beehive.netui.tags.RequestUtils; -import org.apache.beehive.netui.tags.rendering.*; +import org.apache.beehive.netui.tags.TagConfig; +import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender; +import org.apache.beehive.netui.tags.rendering.ScriptTag; +import org.apache.beehive.netui.tags.rendering.StringBuilderRenderAppender; +import org.apache.beehive.netui.tags.rendering.TagRenderingBase; import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; @@ -58,11 +61,11 @@ static public ScriptRequestState getScriptRequestState(HttpServletRequest request) { assert (request != null); - ScriptRequestState srs = (ScriptRequestState) RequestUtils.getOuterAttribute(request,JAVASCRIPT_STATUS); + ScriptRequestState srs = (ScriptRequestState) RequestUtils.getOuterAttribute(request, JAVASCRIPT_STATUS); if (srs == null) { srs = new ScriptRequestState(); srs.setRequest(request); - RequestUtils.setOuterAttribute(request,JAVASCRIPT_STATUS, srs); + RequestUtils.setOuterAttribute(request, JAVASCRIPT_STATUS, srs); } assert (srs != null); return srs; @@ -92,10 +95,11 @@ * A ScriptRequestState is obtained through the factory method ScriptRequestState.getScriptRequestState() * The constructor is private so that these cannot be created outside of the factory. */ - private ScriptRequestState() { + private ScriptRequestState() + { } - public boolean isFeatureWritten(CoreScriptFeature feature) + public boolean isFeatureWritten(CoreScriptFeature feature) { return ((_javaScriptFeatures & feature.value) != 0); } @@ -120,7 +124,6 @@ } /** - * * @param scriptReporter * @param results * @param feature @@ -141,12 +144,12 @@ // get the JavaScript to write out String jsKey = getFeatureKey(feature); String s = getString(jsKey, args); - + if (inline || scriptReporter == null) { - writeScriptBlock(_req,results,s); + writeScriptBlock(_req, results, s); return; } - + scriptReporter.addScriptFunction(null, s); } @@ -248,9 +251,9 @@ //@todo: test compat results.append("\n\n"); - br.doStartTag(results,state); + br.doStartTag(results, state); results.append(script); - br.doEndTag(results,false); + br.doEndTag(results, false); //@todo: test compat results.append("\n\n"); } @@ -262,7 +265,8 @@ * When this is created it the pointer will be stored. * @param req the Outer Request that this object is stored in */ - private void setRequest(ServletRequest req) { + private void setRequest(ServletRequest req) + { _req = req; } @@ -307,62 +311,62 @@ } /** - * This method will write out a tagId map entry for when there - * isn't a ScriptContainer defined. - * @param tagId the tagId value - * @param value the "real" value of the written out - * @param results the JavaScript that will be output - */ - private void getTagIdMapping(String tagId, String value, AbstractRenderAppender results) - { - if ((_javaScriptFeatures & CoreScriptFeature.ALLOCATE_LEGACY.value) == 0) { - _javaScriptFeatures |= CoreScriptFeature.ALLOCATE_LEGACY.value; - String s = getString("singleIdMappingTable", new Object[]{tagId, value}); - String meths = writeNetuiNameFunctions(null, true, false, false); - if (meths != null) - s += meths; - writeScriptBlock(_req, results, s); - } - else { - String s = getString("idMappingEntry", new Object[]{tagId, value}); - writeScriptBlock(_req, results, s); - } - } - - /** - * @param tagId - * @param realId - * @param realName - * @param results - */ - private void getTagIdMapping(String tagId, String realId, String realName, AbstractRenderAppender results) - { - StringBuilder sb = new StringBuilder(128); - if (realId != null) { - if ((_javaScriptFeatures & CoreScriptFeature.ALLOCATE_ID.value) == 0) { - _javaScriptFeatures |= CoreScriptFeature.ALLOCATE_ID.value; - String meths = writeNetuiNameFunctions(null, false, true, false); - if (meths != null) - sb.append(meths); - } - } - - if (realName != null) { - if ((_javaScriptFeatures & CoreScriptFeature.ALLOCATE_NAME.value) == 0) { - _javaScriptFeatures |= CoreScriptFeature.ALLOCATE_NAME.value; - String s = getString("singleIdToNameMappingTable", new Object[]{tagId, realName}); - String meths = writeNetuiNameFunctions(null, false, false, true); - if (meths != null) - s += meths; - sb.append(s); - } - else { - String s = getString("tagIdNameMappingEntry", new Object[]{tagId, realName}); - sb.append(s); - } - } - writeScriptBlock(_req, results, sb.toString()); - } + * This method will write out a tagId map entry for when there + * isn't a ScriptContainer defined. + * @param tagId the tagId value + * @param value the "real" value of the written out + * @param results the JavaScript that will be output + */ + private void getTagIdMapping(String tagId, String value, AbstractRenderAppender results) + { + if ((_javaScriptFeatures & CoreScriptFeature.ALLOCATE_LEGACY.value) == 0) { + _javaScriptFeatures |= CoreScriptFeature.ALLOCATE_LEGACY.value; + String s = getString("singleIdMappingTable", new Object[]{tagId, value}); + String meths = writeNetuiNameFunctions(null, true, false, false); + if (meths != null) + s += meths; + writeScriptBlock(_req, results, s); + } + else { + String s = getString("idMappingEntry", new Object[]{tagId, value}); + writeScriptBlock(_req, results, s); + } + } + + /** + * @param tagId + * @param realId + * @param realName + * @param results + */ + private void getTagIdMapping(String tagId, String realId, String realName, AbstractRenderAppender results) + { + StringBuilder sb = new StringBuilder(128); + if (realId != null) { + if ((_javaScriptFeatures & CoreScriptFeature.ALLOCATE_ID.value) == 0) { + _javaScriptFeatures |= CoreScriptFeature.ALLOCATE_ID.value; + String meths = writeNetuiNameFunctions(null, false, true, false); + if (meths != null) + sb.append(meths); + } + } + + if (realName != null) { + if ((_javaScriptFeatures & CoreScriptFeature.ALLOCATE_NAME.value) == 0) { + _javaScriptFeatures |= CoreScriptFeature.ALLOCATE_NAME.value; + String s = getString("singleIdToNameMappingTable", new Object[]{tagId, realName}); + String meths = writeNetuiNameFunctions(null, false, false, true); + if (meths != null) + s += meths; + sb.append(s); + } + else { + String s = getString("tagIdNameMappingEntry", new Object[]{tagId, realName}); + sb.append(s); + } + } + writeScriptBlock(_req, results, sb.toString()); + } private void writeLookupMethod(IScriptReporter scriptReporter, StringBuilder sb, String bundleString, int feature) { Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/ResponseRenderAppender.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/ResponseRenderAppender.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/ResponseRenderAppender.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/ResponseRenderAppender.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/ResponseRenderAppender.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/ResponseRenderAppender.java Fri Jan 28 20:34:45 2005 @@ -10,14 +10,14 @@ public class ResponseRenderAppender extends AbstractRenderAppender { private static final Logger logger = Logger.getInstance(ResponseRenderAppender.class); - + private ServletResponse _response; - + public ResponseRenderAppender(ServletResponse response) { _response = response; } - + public void append(String s) { try { @@ -28,7 +28,7 @@ logger.error(Bundle.getString("Tags_WriteException"), e); } } - + public void append(char c) { try { @@ -39,5 +39,5 @@ logger.error(Bundle.getString("Tags_WriteException"), e); } } - + } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TFootTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TFootTag.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TFootTag.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TFootTag.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TFootTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TFootTag.java Fri Jan 28 20:34:45 2005 @@ -17,41 +17,47 @@ */ package org.apache.beehive.netui.tags.rendering; -import java.util.HashMap; - import org.apache.beehive.netui.tags.html.HtmlConstants; +import java.util.HashMap; + /** * */ public abstract class TFootTag - extends TagHtmlBase { + extends TagHtmlBase +{ - public static void add(HashMap html, HashMap htmlQuirks, HashMap xhtml) { + public static void add(HashMap html, HashMap htmlQuirks, HashMap xhtml) + { html.put(TFOOT_TAG, new org.apache.beehive.netui.tags.rendering.TFootTag.Rendering()); htmlQuirks.put(TFOOT_TAG, new org.apache.beehive.netui.tags.rendering.TFootTag.Rendering()); xhtml.put(TFOOT_TAG, new org.apache.beehive.netui.tags.rendering.TFootTag.Rendering()); } public static class State - extends AbstractHtmlState { + extends AbstractHtmlState + { - public void clear() { + public void clear() + { super.clear(); } } private static class Rendering - extends TFootTag - implements HtmlConstants { + extends TFootTag + implements HtmlConstants + { // @todo: need to support %coreattrs, %i18n, %events, %cellhalign, %cellvalign on <tfoot> - public void doStartTag(AbstractRenderAppender sb, AbstractTagState renderState) { + public void doStartTag(AbstractRenderAppender sb, AbstractTagState renderState) + { assert(sb != null) : "Parameter 'sb' must not be null"; assert(renderState != null) : "Parameter 'renderState' must not be null"; assert(renderState instanceof State) : "Paramater 'renderState' must be an instance of TdTag.State"; - State state = (State)renderState; + State state = (State) renderState; renderTag(sb, TFOOT); @@ -64,7 +70,8 @@ sb.append(">"); } - public void doEndTag(AbstractRenderAppender sb) { + public void doEndTag(AbstractRenderAppender sb) + { renderEndTag(sb, TFOOT); } } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/ITreeRootElement.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/ITreeRootElement.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/ITreeRootElement.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/ITreeRootElement.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/ITreeRootElement.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/ITreeRootElement.java Fri Jan 28 20:34:45 2005 @@ -23,13 +23,12 @@ * This interface provides additional behavior on the root node in a tree. There * are certain optimizations that may be done if state is tracked in the root. */ -public interface ITreeRootElement extends INameable - { +public interface ITreeRootElement extends INameable +{ /** * Change the node that is selected. This is an optimization were the * root node can track which node is currently selected so it can unselect * that node instead of searching the whole tree to find the selected node. - * * @param selectNode */ void changeSelected(String selectNode); 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=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java&r2=149000 ============================================================================== --- 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 Fri Jan 28 20:34:45 2005 @@ -29,9 +29,9 @@ import org.apache.beehive.netui.tags.*; import org.apache.beehive.netui.tags.html.HtmlConstants; import org.apache.beehive.netui.tags.internal.PageFlowTagUtils; +import org.apache.beehive.netui.tags.javascript.CoreScriptFeature; import org.apache.beehive.netui.tags.javascript.IScriptReporter; import org.apache.beehive.netui.tags.javascript.ScriptRequestState; -import org.apache.beehive.netui.tags.javascript.CoreScriptFeature; import org.apache.beehive.netui.tags.rendering.*; import org.apache.beehive.netui.util.Bundle; @@ -48,7 +48,7 @@ /** * Netui tag that renders a tree control represented by a set of * <code>TreeElement</code> objects. - * @jsptagref.tagdescription Renders a navigable tree of [EMAIL PROTECTED] TreeItem}/[EMAIL PROTECTED] TreeLabel} + * @jsptagref.tagdescription Renders a navigable tree of [EMAIL PROTECTED] TreeItem}/[EMAIL PROTECTED] TreeLabel} * tags. * * <p>This tag can automatically handle display icons for the tree nodes @@ -635,7 +635,7 @@ // we need to register the tree with the NameService if (_runAtClient && treeRoot instanceof INameable) { NameService ns = NameService.instance(pageContext.getSession()); - ns.nameObject("Tree",(INameable) treeRoot); + ns.nameObject("Tree", (INameable) treeRoot); ns.put((INameable) treeRoot); } } @@ -674,11 +674,11 @@ ScriptRequestState srs = ScriptRequestState.getScriptRequestState(request); if (!srs.isFeatureWritten(CoreScriptFeature.DYNAMIC_INIT)) { String s = Bundle.getString("Tags_TreeHtmlRunAtClient", null); - registerTagError(s, null); + registerTagError(s, null); reportErrors(); return; } - srs.writeFeature(sr,writer,CoreScriptFeature.TREE_INIT,true,false,null); + srs.writeFeature(sr, writer, CoreScriptFeature.TREE_INIT, true, false, null); } // create a containing tree level <div> and place the tree level styles on it. @@ -715,7 +715,7 @@ // check to see if we are writing out the java. if (_outputJavaScript) { - String jsOut = renderDefaultJavaScript(request,divId); + String jsOut = renderDefaultJavaScript(request, divId); if (jsOut != null) write(jsOut); } @@ -1197,11 +1197,11 @@ * @param state * @return String */ - protected final String renderTagId(HttpServletRequest request,String tagId, AbstractHtmlState state) + protected final String renderTagId(HttpServletRequest request, String tagId, AbstractHtmlState state) { assert(_tagId != null); state.id = getIdForTagId(tagId); - String script = renderDefaultJavaScript(request,state.id); + String script = renderDefaultJavaScript(request, state.id); return script; } @@ -1218,10 +1218,11 @@ } //**************************** - /** Much of the code below is taken from the HtmlBaseTag. We need to eliminate this duplication + /** + * Much of the code below is taken from the HtmlBaseTag. We need to eliminate this duplication * through some type of helper methods. */ - private String renderDefaultJavaScript(HttpServletRequest request,String realId) + private String renderDefaultJavaScript(HttpServletRequest request, String realId) { String idScript = null; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeCRI.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeCRI.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeCRI.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeCRI.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeCRI.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeCRI.java Fri Jan 28 20:34:45 2005 @@ -20,7 +20,6 @@ import org.apache.beehive.netui.pageflow.requeststate.*; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; public class TreeCRI implements IRequestInterceptor { @@ -40,10 +39,10 @@ // catch any runtime errors here and return. try { - cmd = cmd.substring(ctxtPath.length()+1); + cmd = cmd.substring(ctxtPath.length() + 1); int idx = cmd.lastIndexOf('.'); if (idx != -1) { - cmd = cmd.substring(0,idx); + cmd = cmd.substring(0, idx); } } catch (RuntimeException e) { @@ -52,10 +51,10 @@ // check to see if we handle this command if (TREE_COLLAPSE.equals(cmd)) { - handleExpandCollapse(false,request); + handleExpandCollapse(false, request); } else if (TREE_EXPAND.equals(cmd)) { - handleExpandCollapse(true,request); + handleExpandCollapse(true, request); } return; } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRootElement.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRootElement.java?view=diff&rev=149000&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRootElement.java&r1=148999&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRootElement.java&r2=149000 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRootElement.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRootElement.java Fri Jan 28 20:34:45 2005 @@ -75,14 +75,16 @@ return; } - public void setObjectName(String name) { + public void setObjectName(String name) + { if (_name != null) { throw new IllegalStateException("Attempt to set the ObjectName twice"); } _name = name; } - public String getObjectname() { + public String getObjectname() + { return _name; } }
