Author: dolander Date: Tue Dec 7 10:07:49 2004 New Revision: 110130 URL: http://svn.apache.org/viewcvs?view=rev&rev=110130 Log: This is nothing more than a cleanup checkin. I ran the reformat code in IDEA on all of the Tag code to insure consistency.
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Area.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/CheckBox.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FileUpload.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/Hidden.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.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/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/JavaScriptUtils.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java?view=diff&rev=110130&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java&r1=110129&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java&r2=110130 ============================================================================== --- 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 Tue Dec 7 10:07:49 2004 @@ -1,21 +1,21 @@ package org.apache.beehive.netui.tags.html; import org.apache.beehive.netui.core.urls.MutableURI; -import org.apache.beehive.netui.tags.rendering.*; +import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils; import org.apache.beehive.netui.tags.ByRef; -import org.apache.beehive.netui.tags.IScriptReporter; import org.apache.beehive.netui.tags.HtmlUtils; +import org.apache.beehive.netui.tags.IScriptReporter; 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; import org.apache.beehive.netui.util.logging.Logger; -import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils; -import javax.servlet.jsp.JspException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.servlet.ServletContext; import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.jsp.JspException; import java.net.URISyntaxException; import java.util.HashMap; import java.util.Map; @@ -272,7 +272,7 @@ * 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>. * @param scriptRef a <code>ByRef<String></code> that will contain any JavaScript that may need to be added - * to the generated HTML response. + * to the generated HTML response. * @return a boolean value indicating if an error occur creating the anchor. * @throws JspException */ @@ -341,13 +341,9 @@ // we assume that tagId will over have override id if both // are defined. - if (tagId != null) - { + if (tagId != null) { _state.id = tagId; - idScript = renderNameAndId(_state,null); - } - else { - _state.id = id; + idScript = renderNameAndId(_state, null); } // Special case for name anchors @@ -377,7 +373,7 @@ // report the error... logger.error(Bundle.getString("Tags_URISyntaxException")); String s = Bundle.getString("Tags_Anchor_URLException", - new Object[]{e.getMessage()}); + new Object[]{e.getMessage()}); registerTagError(s, e); } @@ -439,7 +435,7 @@ StringBuilderRenderAppender scriptWriter = new StringBuilderRenderAppender(script); if (_formSubmit && formAction != null) - jsu.writeAnchorFormSubmit(getScriptReporter(),scriptWriter); + jsu.writeAnchorFormSubmit(getScriptReporter(), scriptWriter); if (idScript != null) scriptWriter.append(idScript); scriptRef.setRef(script.toString()); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Area.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Area.java?view=diff&rev=110130&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Area.java&r1=110129&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Area.java&r2=110130 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Area.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Area.java Tue Dec 7 10:07:49 2004 @@ -1,18 +1,19 @@ package org.apache.beehive.netui.tags.html; +import org.apache.beehive.netui.tags.ByRef; import org.apache.beehive.netui.tags.rendering.AbstractHtmlState; -import org.apache.beehive.netui.tags.rendering.WriteRenderAppender; import org.apache.beehive.netui.tags.rendering.TagRenderingBase; -import org.apache.beehive.netui.tags.ByRef; +import org.apache.beehive.netui.tags.rendering.WriteRenderAppender; -import javax.servlet.jsp.JspException; import javax.servlet.http.HttpServletRequest; +import javax.servlet.jsp.JspException; + /** * @netui:tag name="area" description="Generates a URL-encoded area to a specified URI." * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.AreaRenderer" whitespace="indent" * @see Attribute * @see java.lang.String -*/ + */ public class Area extends AnchorBase { /** 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=110130&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java&r1=110129&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java&r2=110130 ============================================================================== --- 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 Tue Dec 7 10:07:49 2004 @@ -18,10 +18,10 @@ package org.apache.beehive.netui.tags.html; import org.apache.beehive.netui.core.urls.URLRewriterService; +import org.apache.beehive.netui.tags.ByRef; import org.apache.beehive.netui.tags.HtmlUtils; import org.apache.beehive.netui.tags.IHtmlAccessable; import org.apache.beehive.netui.tags.internal.PageFlowTagUtils; -import org.apache.beehive.netui.tags.ByRef; import org.apache.beehive.netui.tags.rendering.AbstractHtmlState; import org.apache.beehive.netui.tags.rendering.InputSubmitTag; import org.apache.beehive.netui.tags.rendering.TagRenderingBase; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java?view=diff&rev=110130&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java&r1=110129&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java&r2=110130 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java Tue Dec 7 10:07:49 2004 @@ -19,8 +19,8 @@ import org.apache.beehive.netui.pageflow.ProcessPopulate; import org.apache.beehive.netui.pageflow.RequestParameterHandler; -import org.apache.beehive.netui.tags.IHtmlAccessable; import org.apache.beehive.netui.tags.ByRef; +import org.apache.beehive.netui.tags.IHtmlAccessable; import org.apache.beehive.netui.tags.naming.FormDataNameInterceptor; import org.apache.beehive.netui.tags.naming.IndexedNameInterceptor; import org.apache.beehive.netui.tags.naming.PrefixNameInterceptor; @@ -117,7 +117,8 @@ /** * Determines the current state of the CheckBox (true or false) based on the Request. */ - public void process(HttpServletRequest request, String key, String expr, ProcessPopulate.ExpressionUpdateNode node) + public void process(HttpServletRequest request, String key, String expr, + ProcessPopulate.ExpressionUpdateNode node) { //System.err.println("CheckBox-process: '" + key + "' expr: '" + expr + "'"); @@ -253,8 +254,6 @@ */ public int doEndTag() throws JspException { - //String idScript = null; - Tag parent = getParent(); if (parent instanceof CheckBoxGroup) registerTagError(Bundle.getString("Tags_CheckBoxGroupChildError"), null); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java?view=diff&rev=110130&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java&r1=110129&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java&r2=110130 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java Tue Dec 7 10:07:49 2004 @@ -184,7 +184,8 @@ /** * Determines the current state of the CheckBoxGroup based on the Request. */ - public void process(HttpServletRequest request, String key, String expr, ProcessPopulate.ExpressionUpdateNode node) + public void process(HttpServletRequest request, String key, String expr, + ProcessPopulate.ExpressionUpdateNode node) { String[] returnArray = null; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FileUpload.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FileUpload.java?view=diff&rev=110130&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FileUpload.java&r1=110129&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FileUpload.java&r2=110130 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FileUpload.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FileUpload.java Tue Dec 7 10:07:49 2004 @@ -18,11 +18,11 @@ package org.apache.beehive.netui.tags.html; import org.apache.beehive.netui.pageflow.internal.InternalUtils; +import org.apache.beehive.netui.tags.ByRef; import org.apache.beehive.netui.tags.rendering.AbstractHtmlState; import org.apache.beehive.netui.tags.rendering.InputFileTag; import org.apache.beehive.netui.tags.rendering.TagRenderingBase; import org.apache.beehive.netui.tags.rendering.WriteRenderAppender; -import org.apache.beehive.netui.tags.ByRef; import org.apache.beehive.netui.util.Bundle; import javax.servlet.http.HttpServletRequest; 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=110130&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java&r1=110129&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java&r2=110130 ============================================================================== --- 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 Tue Dec 7 10:07:49 2004 @@ -17,8 +17,8 @@ */ package org.apache.beehive.netui.tags.html; -import org.apache.beehive.netui.core.urls.URLRewriterService; import org.apache.beehive.netui.core.urls.MutableURI; +import org.apache.beehive.netui.core.urls.URLRewriterService; import org.apache.beehive.netui.pageflow.*; import org.apache.beehive.netui.pageflow.internal.ContextCache; import org.apache.beehive.netui.pageflow.internal.InternalUtils; @@ -27,8 +27,8 @@ 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.logging.Logger; import org.apache.beehive.netui.util.ParamHelper; +import org.apache.beehive.netui.util.logging.Logger; import org.apache.struts.Globals; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; @@ -44,7 +44,10 @@ import javax.servlet.http.HttpSession; import javax.servlet.jsp.JspException; import javax.servlet.jsp.PageContext; -import java.util.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; /** * This tag represents an input form, associated with a bean whose @@ -546,7 +549,7 @@ if (_idMapper == null) { _idMapper = new IdMapper(); } - return _idMapper.writeId(id,expression); + return _idMapper.writeId(id, expression); } /** @@ -633,7 +636,7 @@ if (_flowController != null) { bean = _flowController.getFormBean(_mapping); } - + if (bean == null) { bean = InternalUtils.createActionForm(request, _mapping, _appConfig, _servlet, servletContext); @@ -719,11 +722,11 @@ try { actionUrl = PageFlowTagUtils.rewriteActionURL(pageContext, _state.action, null, _location); } - catch ( java.net.URISyntaxException e ) { + catch (java.net.URISyntaxException e) { // report the error... logger.error(Bundle.getString("Tags_URISyntaxException")); String s = Bundle.getString("Tags_Form_URLException", - new Object[]{_state.action, e.getMessage()}); + new Object[]{_state.action, e.getMessage()}); registerTagError(s, e); } @@ -738,7 +741,7 @@ HttpServletResponse response = (HttpServletResponse) pageContext.getResponse(); if (actionUrl != null) { - _state.action = response.encodeURL( actionUrl.toString() ); + _state.action = response.encodeURL(actionUrl.toString()); } WriteRenderAppender writer = new WriteRenderAppender(pageContext); @@ -751,7 +754,7 @@ String token = (String) session.getAttribute(Globals.TRANSACTION_TOKEN_KEY); if (token != null) { - writeHiddenParam(Constants.TOKEN_KEY, token, writer, request,true); + writeHiddenParam(Constants.TOKEN_KEY, token, writer, request, true); } } @@ -765,12 +768,12 @@ String[] paramValArray = (String[]) paramValue; for (int i = 0; i < paramValArray.length; i++) { String paramName = URLRewriterService.rewriteName(servletContext, request, paramKey.toString()); - writeHiddenParam(paramName, paramValArray[i], writer, request,true); + writeHiddenParam(paramName, paramValArray[i], writer, request, true); } } else { String paramName = URLRewriterService.rewriteName(servletContext, request, paramKey.toString()); - writeHiddenParam(paramName, paramValue.toString(), writer, request,true); + writeHiddenParam(paramName, paramValue.toString(), writer, request, true); } } } @@ -800,7 +803,7 @@ // output the hidden fields for id transparency if this is turned on if (IdMapper.isIdTransparency() && _idMapper != null) { String encoded = _idMapper.getExpressions(); - writeHiddenParam(ProcessPopulate.IDMAP_PARAMETER_NAME, encoded, writer, request,false); + writeHiddenParam(ProcessPopulate.IDMAP_PARAMETER_NAME, encoded, writer, request, false); writer.append("\n"); } @@ -819,7 +822,7 @@ if (_formSubmit) { JavaScriptUtils jsu = getJavaScriptUtils(request); - jsu.writeAnchorFormSubmit(getScriptReporter(),writer); + jsu.writeAnchorFormSubmit(getScriptReporter(), writer); } // output any generated javascript @@ -838,7 +841,7 @@ * @param req THe servlet request */ private void writeHiddenParam(String paramName, String paramValue, AbstractRenderAppender results, - ServletRequest req,boolean newLine) + ServletRequest req, boolean newLine) { // put each hidden on a new line if (newLine) Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java?view=diff&rev=110130&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java&r1=110129&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java&r2=110130 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java Tue Dec 7 10:07:49 2004 @@ -17,8 +17,8 @@ */ package org.apache.beehive.netui.tags.html; -import org.apache.beehive.netui.tags.HtmlUtils; import org.apache.beehive.netui.tags.ByRef; +import org.apache.beehive.netui.tags.HtmlUtils; import org.apache.beehive.netui.tags.rendering.*; import org.apache.beehive.netui.util.Bundle; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java?view=diff&rev=110130&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java&r1=110129&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java&r2=110130 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java Tue Dec 7 10:07:49 2004 @@ -269,7 +269,7 @@ } // close the html tag - _writer.append("\n"); + _writer.append("\n"); _br.doEndTag(_writer); localRelease(); return EVAL_PAGE; 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=110130&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDataSourceTag.java&r1=110129&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDataSourceTag.java&r2=110130 ============================================================================== --- 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 Tue Dec 7 10:07:49 2004 @@ -18,9 +18,8 @@ package org.apache.beehive.netui.tags.html; import org.apache.beehive.netui.tags.AbstractClassicTag; -import org.apache.beehive.netui.tags.ExpressionHandling; -import org.apache.beehive.netui.tags.IHtmlIdWriter; import org.apache.beehive.netui.tags.ByRef; +import org.apache.beehive.netui.tags.ExpressionHandling; import org.apache.beehive.netui.tags.rendering.AbstractHtmlControlState; import javax.servlet.jsp.JspException; @@ -121,11 +120,11 @@ * attribute. If this is present then we write out a JavaScript that allows mapping * the tagId set on the tag to both the real <b>id</b> value and also the <b>name</b> value. * The <b>id</b> is formed by passing the <b>tagId</b> to the URL rewritter service. - * @param state The tag state structure. This contains both the name and id attributes. The - * id attribute should be set with the initial value from the tagId. + * @param state The tag state structure. This contains both the name and id attributes. The + * id attribute should be set with the initial value from the tagId. * @param javaScript A ByRef element that will contain any JavaScript that should be written out - * by the calling tag. A value is returned only if tagId is set and there is not IScriptReporter - * found. + * by the calling tag. A value is returned only if tagId is set and there is not IScriptReporter + * found. * @throws JspException Pass through the exception from applyNamingChain. */ protected void nameHtmlControl(AbstractHtmlControlState state, ByRef javaScript) @@ -140,10 +139,10 @@ state.name = applyNamingChain(datasource); Form parentForm = getNearestForm(); - String idScript = renderNameAndId(state,parentForm); + String idScript = renderNameAndId(state, parentForm); if (idScript != null) javaScript.setRef(idScript); - + // if there is an id, we need to create the javascript and form // focus support for it. /* 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=110130&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java&r1=110129&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java&r2=110130 ============================================================================== --- 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 Tue Dec 7 10:07:49 2004 @@ -309,7 +309,7 @@ catch (URISyntaxException e) { // report the error... String s = Bundle.getString("Tags_Image_URLException", - new Object[]{_state.src, e.getMessage()}); + new Object[]{_state.src, e.getMessage()}); registerTagError(s, e); } } 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=110130&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageAnchor.java&r1=110129&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageAnchor.java&r2=110130 ============================================================================== --- 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 Tue Dec 7 10:07:49 2004 @@ -18,16 +18,19 @@ package org.apache.beehive.netui.tags.html; import org.apache.beehive.netui.core.urls.MutableURI; -import org.apache.beehive.netui.tags.IHtmlAccessable; import org.apache.beehive.netui.tags.ByRef; +import org.apache.beehive.netui.tags.IHtmlAccessable; import org.apache.beehive.netui.tags.internal.PageFlowTagUtils; -import org.apache.beehive.netui.tags.rendering.*; +import org.apache.beehive.netui.tags.rendering.AbstractHtmlState; +import org.apache.beehive.netui.tags.rendering.ImageTag; +import org.apache.beehive.netui.tags.rendering.TagRenderingBase; +import org.apache.beehive.netui.tags.rendering.WriteRenderAppender; import org.apache.beehive.netui.util.Bundle; -import java.net.URISyntaxException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.JspException; +import java.net.URISyntaxException; /** * Generates a URL-encoded hyperlink to a specified URI with an image @@ -393,7 +396,7 @@ // cause the roll over script to be inserted WriteRenderAppender writer = new WriteRenderAppender(pageContext); JavaScriptUtils jsu = getJavaScriptUtils((HttpServletRequest) pageContext.getRequest()); - jsu.writeRollover(getScriptReporter(),writer); + jsu.writeRollover(getScriptReporter(), writer); } return EVAL_BODY_BUFFERED; @@ -435,7 +438,7 @@ catch (URISyntaxException e) { // report the error... String s = Bundle.getString("Tags_Image_URLException", - new Object[]{_imgState.src, e.getMessage()}); + new Object[]{_imgState.src, e.getMessage()}); registerTagError(s, e); } } @@ -449,7 +452,7 @@ catch (URISyntaxException e) { // report the error... String s = Bundle.getString("Tags_Rollover_Image_URLException", - new Object[]{_rolloverImage, e.getMessage()}); + new Object[]{_rolloverImage, e.getMessage()}); registerTagError(s, e); } 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=110130&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java&r1=110129&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java&r2=110130 ============================================================================== --- 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 Tue Dec 7 10:07:49 2004 @@ -28,11 +28,11 @@ import org.apache.struts.Globals; import org.apache.struts.config.ModuleConfig; -import java.net.URISyntaxException; import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.JspException; +import java.net.URISyntaxException; /** * Generates an <code><input type="image"></code> tag with the specified attributes. ImageButton @@ -264,7 +264,7 @@ // cause the roll over script to be inserted JavaScriptUtils jsu = getJavaScriptUtils((HttpServletRequest) pageContext.getRequest()); WriteRenderAppender writer = new WriteRenderAppender(pageContext); - jsu.writeRollover(getScriptReporter(),writer); + jsu.writeRollover(getScriptReporter(), writer); } return EVAL_BODY_BUFFERED; @@ -296,7 +296,7 @@ // we assume that tagId will over have override id if both // are defined. if (getTagId() != null) { - idScript = renderNameAndId(_state,null); + idScript = renderNameAndId(_state, null); } HttpServletResponse response = (HttpServletResponse) pageContext.getResponse(); @@ -309,7 +309,7 @@ catch (URISyntaxException e) { // report the error... String s = Bundle.getString("Tags_Image_URLException", - new Object[]{_state.src, e.getMessage()}); + new Object[]{_state.src, e.getMessage()}); registerTagError(s, e); } } @@ -331,7 +331,7 @@ catch (URISyntaxException e) { // report the error... String s = Bundle.getString("Tags_Rollover_Image_URLException", - new Object[]{_rolloverImage, e.getMessage()}); + new Object[]{_rolloverImage, e.getMessage()}); registerTagError(s, e); } } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/JavaScriptUtils.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/JavaScriptUtils.java?view=diff&rev=110130&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/JavaScriptUtils.java&r1=110129&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/JavaScriptUtils.java&r2=110130 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/JavaScriptUtils.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/JavaScriptUtils.java Tue Dec 7 10:07:49 2004 @@ -75,7 +75,7 @@ /** * this will write out the form focus script block */ - public static void getFocusScript(String formName, String fieldName,AbstractRenderAppender results) + public static void getFocusScript(String formName, String fieldName, AbstractRenderAppender results) { assert (formName != null); assert (fieldName != null); @@ -89,7 +89,7 @@ * This method will write out a tagId map entry for when there * isn't a ScriptContainer defined. */ - public void getTagIdMapping(String tagId, String value,AbstractRenderAppender results) + public void getTagIdMapping(String tagId, String value, AbstractRenderAppender results) { String s = getString("singleIdMappingTable", new Object[]{ tagId, value}); @@ -102,7 +102,7 @@ /** * */ - public void writeRollover(IScriptReporter scriptReporter,AbstractRenderAppender results) + public void writeRollover(IScriptReporter scriptReporter, AbstractRenderAppender results) { if (_rollover) return; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java?view=diff&rev=110130&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java&r1=110129&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java&r2=110130 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java Tue Dec 7 10:07:49 2004 @@ -24,11 +24,11 @@ import org.apache.beehive.netui.tags.internal.PageFlowTagUtils; import org.apache.beehive.netui.util.Bundle; -import java.net.URISyntaxException; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.JspException; +import java.net.URISyntaxException; /** * Allow a name, typically either an id or name attribute, to participate in URL @@ -103,7 +103,7 @@ catch (URISyntaxException e) { // report the error... String s = Bundle.getString("Tags_RewriteURL_URLException", - new Object[]{url, e.getMessage()}); + new Object[]{url, e.getMessage()}); registerTagError(s, e); } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java?view=diff&rev=110130&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java&r1=110129&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java&r2=110130 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java Tue Dec 7 10:07:49 2004 @@ -145,9 +145,9 @@ _idToIdMap.put(tagId, realId); if (realName != null) { - if (_idToNameMap == null) - _idToNameMap = new HashMap(); - _idToNameMap.put(tagId,realName); + if (_idToNameMap == null) + _idToNameMap = new HashMap(); + _idToNameMap.put(tagId, realName); } } @@ -463,7 +463,7 @@ if (script) JavaScriptUtils.writeScriptEnd(sb); - } + } /////////////////////////////////// Private Support //////////////////////////////////// Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java?view=diff&rev=110130&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java&r1=110129&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java&r2=110130 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java Tue Dec 7 10:07:49 2004 @@ -21,11 +21,11 @@ import org.apache.beehive.netui.pageflow.RequestParameterHandler; import org.apache.beehive.netui.script.common.DataAccessProviderStack; import org.apache.beehive.netui.script.common.IDataAccessProvider; +import org.apache.beehive.netui.tags.ByRef; import org.apache.beehive.netui.tags.naming.FormDataNameInterceptor; import org.apache.beehive.netui.tags.naming.IndexedNameInterceptor; import org.apache.beehive.netui.tags.naming.PrefixNameInterceptor; import org.apache.beehive.netui.tags.rendering.*; -import org.apache.beehive.netui.tags.ByRef; import org.apache.beehive.netui.util.Bundle; import org.apache.beehive.netui.util.iterator.IteratorFactory; import org.apache.beehive.netui.util.iterator.IteratorFactoryException; @@ -715,7 +715,6 @@ */ public int doEndTag() throws JspException { - String scriptId = null; ServletRequest req = pageContext.getRequest(); String fmtErrors = null; @@ -771,9 +770,8 @@ return reportAndExit(EVAL_PAGE); br.doEndTag(writer); - - if (scriptId != null) - write(scriptId); + if (!ref.isNull()) + write((String) ref.getRef()); // Continue processing this page localRelease(); @@ -817,9 +815,8 @@ } br.doEndTag(writer); - - if (scriptId != null) - write(scriptId); + if (!ref.isNull()) + write((String) ref.getRef()); // Continue processing this page localRelease(); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java?view=diff&rev=110130&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java&r1=110129&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java&r2=110130 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java Tue Dec 7 10:07:49 2004 @@ -17,8 +17,8 @@ */ package org.apache.beehive.netui.tags.html; -import org.apache.beehive.netui.tags.HtmlUtils; import org.apache.beehive.netui.tags.ByRef; +import org.apache.beehive.netui.tags.HtmlUtils; import org.apache.beehive.netui.tags.rendering.AbstractHtmlState; import org.apache.beehive.netui.tags.rendering.TagRenderingBase; import org.apache.beehive.netui.tags.rendering.TextAreaTag; @@ -199,7 +199,7 @@ String text = formatText(textObject); if (text != null) - HtmlUtils.filter(text,writer); + HtmlUtils.filter(text, writer); //results.append(text); br.doEndTag(writer); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java?view=diff&rev=110130&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java&r1=110129&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java&r2=110130 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java Tue Dec 7 10:07:49 2004 @@ -17,9 +17,9 @@ */ package org.apache.beehive.netui.tags.html; +import org.apache.beehive.netui.tags.ByRef; import org.apache.beehive.netui.tags.HtmlUtils; import org.apache.beehive.netui.tags.IHtmlAccessable; -import org.apache.beehive.netui.tags.ByRef; import org.apache.beehive.netui.tags.rendering.*; import org.apache.beehive.netui.util.Bundle; @@ -264,7 +264,7 @@ text = formatText(textObject); StringBuilder sb = new StringBuilder(text.length() + 16); StringBuilderRenderAppender sbAppend = new StringBuilderRenderAppender(sb); - HtmlUtils.filter(text,sbAppend); + HtmlUtils.filter(text, sbAppend); text = sb.toString(); } _state.value = text;
