Author: dolander Date: Fri Jan 7 19:59:20 2005 New Revision: 124619 URL: http://svn.apache.org/viewcvs?view=rev&rev=124619 Log: Apply a consistent formatting to the HTML Tags.
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/AbstractSimpleTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ByRef.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/DataSourceTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ErrorHandling.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ExpressionHandling.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/HtmlUtils.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/IHtmlAttrs.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlCore.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/INetuiTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.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/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/Errors.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/Html.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/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/SelectOption.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/PageFlowTagUtils.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/FormDataNameInterceptor.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/IndexedNameInterceptor.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/NameInterceptor.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/PrefixNameInterceptor.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractAttributeState.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractRenderAppender.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/BodyTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/HtmlTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputBooleanTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputSubmitTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputTextTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/OptionTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/SelectTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/StringBuilderRenderAppender.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/THeadTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagHtmlBase.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TextAreaTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/ThTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/AttributeRenderer.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/TreeItem.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=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java&r2=124619 ============================================================================== --- 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 7 19:59:20 2005 @@ -117,7 +117,7 @@ */ protected void localRelease() { - _eh = null; + _eh = null; } /** @@ -142,7 +142,8 @@ JspWriter writer = pageContext.getOut(); try { writer.print(string); - } catch (IOException e) { + } + catch (IOException e) { logger.error(Bundle.getString("Tags_WriteException"), e); RequestUtils.saveException((PageContext) pageContext, e); } @@ -194,7 +195,7 @@ * @see org.apache.beehive.netui.tags.naming.NameInterceptor */ protected String applyNamingChain(String name) - throws JspException + throws JspException { assert (name != null) : "The name parameter may not be null"; @@ -304,18 +305,18 @@ * that value. If <code>attrValue</code> is equal to the empty string, an error is registered and * null is returned. * @param attrValue The value to be checked for the empty string - * @param attrName The name of the attribute - * @return either the attrValue if it is not the empty string or null + * @param attrName The name of the attribute + * @return either the attrValue if it is not the empty string or null * @throws JspException A JspException will be thrown if inline error reporting is turned off. */ - protected final String setRequiredValueAttribute(String attrValue,String attrName) - throws JspException + protected final String setRequiredValueAttribute(String attrValue, String attrName) + throws JspException { assert(attrValue != null) : "parameter 'attrValue' must not be null"; assert(attrName != null) : "parameter 'attrName' must not be null"; if ("".equals(attrValue)) { - String s = Bundle.getString("Tags_AttrValueRequired", new Object[] {attrName}); + String s = Bundle.getString("Tags_AttrValueRequired", new Object[]{attrName}); registerTagError(s, null); return null; } @@ -345,7 +346,7 @@ * @throws JspException */ protected int reportAndExit(int returnValue) - throws JspException + throws JspException { if (hasErrors()) { reportErrors(); @@ -367,22 +368,22 @@ throws JspException { ErrorHandling eh = getErrorHandling(); - eh.registerTagError(message,getTagName(),this,e); + eh.registerTagError(message, getTagName(), this, e); } /** * This will report an error from a tag. The error must * be be an AbstractPageError. - * @param error The <code>AbstractPageError</code> to add to the error list. - * @throws JspException - if in-page error reporting is turned off this method will always + * @param error The <code>AbstractPageError</code> to add to the error list. + * @throws JspException - if in-page error reporting is turned off this method will always * throw a JspException. */ public void registerTagError(AbstractPageError error) - throws JspException + throws JspException { ErrorHandling eh = getErrorHandling(); - eh.registerTagError(error,this); - } + eh.registerTagError(error, this); + } /** * This method will return <code>true</code> if there have been any errors registered on this @@ -405,7 +406,7 @@ { assert(_eh != null); String err = _eh.getErrorsReport(getTagName()); - IErrorCollector ec = (IErrorCollector) SimpleTagSupport.findAncestorWithClass(this,IErrorCollector.class); + IErrorCollector ec = (IErrorCollector) SimpleTagSupport.findAncestorWithClass(this, IErrorCollector.class); if (ec != null) { ec.collectChildError(err); } @@ -431,7 +432,8 @@ * This method will return an ErrorHandling instance. * @return */ - private ErrorHandling getErrorHandling() { + private ErrorHandling getErrorHandling() + { if (_eh == null) { _eh = new ErrorHandling(); } @@ -447,7 +449,7 @@ */ protected IScriptReporter getScriptReporter() { - IScriptReporter sr = (IScriptReporter) SimpleTagSupport.findAncestorWithClass(this,IScriptReporter.class); + IScriptReporter sr = (IScriptReporter) SimpleTagSupport.findAncestorWithClass(this, IScriptReporter.class); return sr; } @@ -461,7 +463,7 @@ * to the caller so they can output the script block. * @param tagId * @param value - * @return String + * @return String */ protected String mapLegacyTagId(String tagId, String value) { 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=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java&r2=124619 ============================================================================== --- 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 7 19:59:20 2005 @@ -1,10 +1,10 @@ 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.pageflow.util.URLRewriterService; -import org.apache.struts.util.RequestUtils; import org.apache.struts.Globals; +import org.apache.struts.util.RequestUtils; import javax.servlet.jsp.JspContext; import javax.servlet.jsp.JspException; @@ -18,7 +18,6 @@ import java.util.Locale; /** - * * @netui:tag */ public abstract class AbstractSimpleTag extends SimpleTagSupport implements INetuiTag @@ -33,7 +32,6 @@ public abstract String getTagName(); /** - * * @param trim * @return * @throws JspException @@ -58,18 +56,18 @@ * that value. If <code>attrValue</code> is equal to the empty string, an error is registered and * null is returned. * @param attrValue The value to be checked for the empty string - * @param attrName The name of the attribute - * @return either the attrValue if it is not the empty string or null + * @param attrName The name of the attribute + * @return either the attrValue if it is not the empty string or null * @throws JspException A JspException will be thrown if inline error reporting is turned off. */ - protected final String setRequiredValueAttribute(String attrValue,String attrName) - throws JspException + protected final String setRequiredValueAttribute(String attrValue, String attrName) + throws JspException { assert(attrValue != null) : "parameter 'attrValue' must not be null"; assert(attrName != null) : "parameter 'attrName' must not be null"; if ("".equals(attrValue)) { - String s = Bundle.getString("Tags_AttrValueRequired", new Object[] {attrName}); + String s = Bundle.getString("Tags_AttrValueRequired", new Object[]{attrName}); registerTagError(s, null); return null; } @@ -123,17 +121,18 @@ * @param string to be written to the response. */ protected final void write(String string) - throws JspException + throws JspException { JspContext ctxt = getJspContext(); JspWriter writer = ctxt.getOut(); try { writer.print(string); - } catch (IOException e) { + } + catch (IOException e) { logger.error(Bundle.getString("Tags_WriteException"), e); if (ctxt instanceof PageContext) RequestUtils.saveException((PageContext) ctxt, e); - throw new JspException(e.getMessage(),e); + throw new JspException(e.getMessage(), e); } } @@ -144,21 +143,21 @@ * a JspException to report the error. * @param message - the message to register with the error * @throws javax.servlet.jsp.JspException - if in-page error reporting is turned off this method will always - * throw a JspException. + * throw a JspException. */ public void registerTagError(String message, Throwable e) throws JspException { ErrorHandling eh = getErrorHandling(); - eh.registerTagError(message,getTagName(),this,e); + eh.registerTagError(message, getTagName(), this, e); } public void registerTagError(AbstractPageError error) - throws JspException + throws JspException { ErrorHandling eh = getErrorHandling(); - eh.registerTagError(error,this); - } + eh.registerTagError(error, this); + } /** * This method will return <code>true</code> if there have been any errors registered on this @@ -181,7 +180,7 @@ { assert(_eh != null); String err = _eh.getErrorsReport(getTagName()); - IErrorCollector ec = (IErrorCollector) SimpleTagSupport.findAncestorWithClass(this,IErrorCollector.class); + IErrorCollector ec = (IErrorCollector) SimpleTagSupport.findAncestorWithClass(this, IErrorCollector.class); if (ec != null) { ec.collectChildError(err); } @@ -190,7 +189,8 @@ } } - protected String getInlineError() { + protected String getInlineError() + { return _eh.getInlineError(getTagName()); } @@ -198,7 +198,8 @@ * This method will return an ErrorHandling instance. * @return */ - private ErrorHandling getErrorHandling() { + private ErrorHandling getErrorHandling() + { if (_eh == null) { _eh = new ErrorHandling(); } @@ -212,7 +213,7 @@ */ protected IScriptReporter getScriptReporter() { - IScriptReporter sr = (IScriptReporter) SimpleTagSupport.findAncestorWithClass(this,IScriptReporter.class); + IScriptReporter sr = (IScriptReporter) SimpleTagSupport.findAncestorWithClass(this, IScriptReporter.class); return sr; } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ByRef.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ByRef.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ByRef.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ByRef.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ByRef.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ByRef.java Fri Jan 7 19:59:20 2005 @@ -4,15 +4,18 @@ { private Object _ref; - public Object getRef() { + public Object getRef() + { return _ref; } - public void setRef(Object ref) { + public void setRef(Object ref) + { _ref = ref; } - public boolean isNull() { + public boolean isNull() + { return (_ref == null); } } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/DataSourceTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/DataSourceTag.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/DataSourceTag.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/DataSourceTag.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/DataSourceTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/DataSourceTag.java Fri Jan 7 19:59:20 2005 @@ -83,39 +83,34 @@ /** * Sets the tag's data source (can be an expression). * @param dataSource - the data source - * - * @jsptagref.attributedescription - * <p>The <code>dataSource</code> attribute determines both - * (1) the source of populating data for the tag and + * @jsptagref.attributedescription <p>The <code>dataSource</code> attribute determines both + * (1) the source of populating data for the tag and * (2) the object to which the tag submits data. - * + * * <p>For example, assume that the Controller file (= JPF file) contains * a Form Bean with the property foo. Then the following <netui:textBox> tag will * (1) draw populating data from the Form Bean's foo property and (2) * submit user defined data to the same property. - * - * <p> <code><netui:textBox dataSource="{actionForm.foo}" /></code> - * - * <p>The <code>dataSource</code> attribute takes either a data binding expression or + * + * <p> <code><netui:textBox dataSource="{actionForm.foo}" /></code> + * + * <p>The <code>dataSource</code> attribute takes either a data binding expression or * the name of a Form Bean property. In the - * above example, <code><netui:textBox dataSource="foo" /></code> - * would have the exactly same behavior. - * + * above example, <code><netui:textBox dataSource="foo" /></code> + * would have the exactly same behavior. + * * <p>When the tag is used to submit data, the data binding expression must * refer to a Form Bean property. - * In cases where the tag is not used to submit data, but is used for + * In cases where the tag is not used to submit data, but is used for * displaying data only, the data - * binding expression need not refer to a Form Bean property. For example, - * assume that myIterativeData is a member variable on + * binding expression need not refer to a Form Bean property. For example, + * assume that myIterativeData is a member variable on * the Controller file ( = JPF file). The following <netui-data:repeater> - * tag draws its data from myIterativeData. - * + * tag draws its data from myIterativeData. + * * <p> <code><netui-data:repeater dataSource="{pageFlow.myIterativeData}"></code> - * * @jsptagref.databindable Read / Write - * * @jsptagref.attributesyntaxvalue <i>expression_datasource</i> - * * @netui:attribute required="true" * @netui.tldx:attribute language="netuiel" */ Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ErrorHandling.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ErrorHandling.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ErrorHandling.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ErrorHandling.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ErrorHandling.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ErrorHandling.java Fri Jan 7 19:59:20 2005 @@ -8,10 +8,10 @@ import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.JspTag; import javax.servlet.jsp.tagext.SimpleTagSupport; +import java.io.IOException; +import java.io.Writer; import java.util.ArrayList; import java.util.List; -import java.io.Writer; -import java.io.IOException; public class ErrorHandling { @@ -30,9 +30,9 @@ * a JspException to report the error. * @param message - the message to register with the error * @throws javax.servlet.jsp.JspException - if in-page error reporting is turned off this method will always - * throw a JspException. + * throw a JspException. */ - public void registerTagError(String message, String tagName, JspTag tag,Throwable e) + public void registerTagError(String message, String tagName, JspTag tag, Throwable e) throws JspException { assert (message != null) : "parameter 'message' must not be null."; @@ -83,7 +83,7 @@ * @param error The <code>EvalErrorInfo</code> describing the error. */ public void registerTagError(AbstractPageError error, JspTag tag) - throws JspException + throws JspException { assert (error != null); @@ -121,27 +121,27 @@ * @throws JspException if <code>write</code> throws an exception. * @see #getErrorsReport */ - public void reportErrors(Writer writer,String tagName) + public void reportErrors(Writer writer, String tagName) throws JspException { try { writer.write(getErrorsReport(tagName)); } catch (IOException e) { - throw new JspException(e.getMessage(),e); + throw new JspException(e.getMessage(), e); } } - public String getInlineError(String tagName) { + public String getInlineError(String tagName) + { if (isInlineErrors()) { AbstractPageError info = (AbstractPageError) _errors.get(0); - return getInlineError(info,tagName); + return getInlineError(info, tagName); } return null; } - /** * This method will return a <code>String<code> that represents all of the errors that were * registered for the tag. This method assumes that there are errors in the tag and asserts @@ -161,9 +161,9 @@ // check the first error to see if we are reporting errors at the end AbstractPageError info = (AbstractPageError) _errors.get(0); if (isInlineErrors()) { - String s = getInlineError(info,tagName); + String s = getInlineError(info, tagName); return s; - } + } // create the errors String s; @@ -204,7 +204,7 @@ * This method get the current errors and write the formated output * @param sb */ - public static void reportCollectedErrors(StringBuilder sb,JspTag tag) + public static void reportCollectedErrors(StringBuilder sb, JspTag tag) { IErrorReporter er = getErrorReporter(tag); if (er == null) @@ -256,7 +256,7 @@ * This method get the current errors and write the formated output * @param pc */ - public static void reportCollectedErrors(PageContext pc,JspTag tag) + public static void reportCollectedErrors(PageContext pc, JspTag tag) { IErrorReporter er = getErrorReporter(tag); if (er == null) @@ -272,7 +272,7 @@ String s; // write the error header s = Bundle.getString("Footer_Error_Header"); - write(pc,s); + write(pc, s); int cnt = errors.size(); Object[] args = new Object[5]; @@ -287,7 +287,7 @@ args[3] = err.expression; args[4] = err.evalExcp.getMessage(); s = Bundle.getString("Footer_Error_Expr_Body", args); - write(pc,s); + write(pc, s); } else if (o instanceof TagErrorInfo) { TagErrorInfo tei = (TagErrorInfo) o; @@ -295,21 +295,22 @@ args[1] = tei.tagType; args[2] = tei.message; s = Bundle.getString("Footer_Error_Tag_Body", args); - write(pc,s); + write(pc, s); } } // write the error footer s = Bundle.getString("Footer_Error_Footer"); - write(pc,s); + write(pc, s); } - private boolean isInlineErrors() { + private boolean isInlineErrors() + { AbstractPageError info = (AbstractPageError) _errors.get(0); return (info.errorNo > 0); } - private String getInlineError(AbstractPageError info,String tagName) + private String getInlineError(AbstractPageError info, String tagName) { String s; if (info instanceof EvalErrorInfo) { @@ -348,11 +349,11 @@ return (IErrorReporter) tag; // check to see if this tag has is an ErrorReporter or has an ErrorReporter as a parent - IErrorReporter er = (IErrorReporter) SimpleTagSupport.findAncestorWithClass(tag,IErrorReporter.class); + IErrorReporter er = (IErrorReporter) SimpleTagSupport.findAncestorWithClass(tag, IErrorReporter.class); while (er != null) { if (er.isReporting()) return er; - er = (IErrorReporter) SimpleTagSupport.findAncestorWithClass((JspTag) er,IErrorReporter.class); + er = (IErrorReporter) SimpleTagSupport.findAncestorWithClass((JspTag) er, IErrorReporter.class); } return null; } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ExpressionHandling.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ExpressionHandling.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ExpressionHandling.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ExpressionHandling.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ExpressionHandling.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ExpressionHandling.java Fri Jan 7 19:59:20 2005 @@ -21,7 +21,6 @@ import org.apache.beehive.netui.script.ExpressionEvaluator; import org.apache.beehive.netui.script.ExpressionEvaluatorFactory; import org.apache.beehive.netui.script.ExpressionUpdateException; -import org.apache.beehive.netui.script.el.NetUIUpdateVariableResolver; import org.apache.beehive.netui.script.common.ImplicitObjectUtil; import org.apache.beehive.netui.util.Bundle; import org.apache.beehive.netui.util.logging.Logger; @@ -29,8 +28,6 @@ import javax.servlet.jsp.JspException; import javax.servlet.jsp.PageContext; import javax.servlet.jsp.el.VariableResolver; - -import org.apache.struts.action.ActionForm; public class ExpressionHandling { Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/HtmlUtils.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/HtmlUtils.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/HtmlUtils.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/HtmlUtils.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/HtmlUtils.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/HtmlUtils.java Fri Jan 7 19:59:20 2005 @@ -17,10 +17,8 @@ */ package org.apache.beehive.netui.tags; -import org.apache.beehive.netui.util.config.ConfigUtil; -import org.apache.beehive.netui.util.config.bean.NetuiConfigDocument; -import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender; import org.apache.beehive.netui.core.URLCodec; +import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender; import javax.servlet.jsp.JspException; import java.io.UnsupportedEncodingException; @@ -69,41 +67,41 @@ for (int i = 0; i < numChars; i++) { c = value.charAt(i); switch (c) { - case '<': - result.append("<"); - break; - case '>': - result.append(">"); - break; - case '&': - result.append("&"); - break; - case '"': - result.append("""); - break; - case '\'': - result.append("'"); - break; - case ' ': - if (markupHTMLSpaceReturn) { - if (prev == ' ') { - result.append(" "); + case '<': + result.append("<"); + break; + case '>': + result.append(">"); + break; + case '&': + result.append("&"); + break; + case '"': + result.append("""); + break; + case '\'': + result.append("'"); + break; + case ' ': + if (markupHTMLSpaceReturn) { + if (prev == ' ') { + result.append(" "); + } + else + result.append(c); } else result.append(c); - } - else - result.append(c); - break; - case '\n': - if (markupHTMLSpaceReturn) { - result.append("<br />"); - } - else + break; + case '\n': + if (markupHTMLSpaceReturn) { + result.append("<br />"); + } + else + result.append(c); + break; + default: result.append(c); - break; - default: - result.append(c); } prev = c; } 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=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IErrorCollector.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IErrorCollector.java&r2=124619 ============================================================================== --- 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 7 19:59:20 2005 @@ -17,7 +17,7 @@ */ package org.apache.beehive.netui.tags; -import java.util.ArrayList; + /** * An <code>IErrorCollector</code> collects errors generated by the children and reports them. This is used Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlAttrs.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlAttrs.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlAttrs.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlAttrs.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlAttrs.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlAttrs.java Fri Jan 7 19:59:20 2005 @@ -18,7 +18,6 @@ package org.apache.beehive.netui.tags; - public interface IHtmlAttrs extends IHtmlCore, IHtmlI18n, IHtmlEvents { } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlCore.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlCore.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlCore.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlCore.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlCore.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlCore.java Fri Jan 7 19:59:20 2005 @@ -42,7 +42,7 @@ * @param tagId - the tagId. */ void setTagId(String tagId) - throws JspException; + throws JspException; /** * Returns the Nodes title. Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/INetuiTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/INetuiTag.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/INetuiTag.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/INetuiTag.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/INetuiTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/INetuiTag.java Fri Jan 7 19:59:20 2005 @@ -1,13 +1,15 @@ package org.apache.beehive.netui.tags; -import javax.servlet.jsp.tagext.JspTag; import javax.servlet.jsp.JspException; +import javax.servlet.jsp.tagext.JspTag; public interface INetuiTag extends JspTag { String getTagName(); + void registerTagError(String message, Throwable e) - throws JspException; + throws JspException; + void registerTagError(AbstractPageError error) - throws JspException; + throws JspException; } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java Fri Jan 7 19:59:20 2005 @@ -1,8 +1,8 @@ package org.apache.beehive.netui.tags; +import org.apache.beehive.netui.tags.tree.InheritableState; import org.apache.beehive.netui.util.config.ConfigUtil; import org.apache.beehive.netui.util.config.bean.JspTagConfig; -import org.apache.beehive.netui.tags.tree.InheritableState; /** @@ -46,7 +46,7 @@ assert(javascriptMode != -1); return (javascriptMode == JspTagConfig.IdJavascript.INT_DEFAULT || javascriptMode == JspTagConfig.IdJavascript.INT_LEGACY); - } + } /** * This method returns the default location for the tree images. This may be configured by setting @@ -55,9 +55,10 @@ * path within the webapp. * <p><tree-image-location>resources/images</tree-image-location> * </p> - * @return the default location of the tree images. + * @return the default location of the tree images. */ - public static String getTreeImageLocation() { + public static String getTreeImageLocation() + { if (defaultTreeImageLocation == null) { JspTagConfig tagConfig = ConfigUtil.getConfig().getJspTagConfig(); if (tagConfig != null) { @@ -74,7 +75,8 @@ /** * This will set the JavaScript support level for the id and name attributes. */ - private static void setLegacyJavaScriptMode() { + private static void setLegacyJavaScriptMode() + { JspTagConfig tagConfig = ConfigUtil.getConfig().getJspTagConfig(); if (tagConfig != null) { javascriptMode = tagConfig.getIdJavascript().intValue(); 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=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java&r2=124619 ============================================================================== --- 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 7 19:59:20 2005 @@ -245,7 +245,7 @@ } _params.put(Constants.TOKEN_KEY, token); } - + String overrideAction = ACTION_OVERRIDE + _action; overrideAction = HtmlUtils.addParams(overrideAction, _params, response.getCharacterEncoding()); String buttonOutput = URLRewriterService.rewriteName(pageContext.getServletContext(), 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=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java&r2=124619 ============================================================================== --- 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 7 19:59:20 2005 @@ -19,9 +19,8 @@ import org.apache.beehive.netui.util.Bundle; import org.apache.struts.Globals; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionError; import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMessage; import org.apache.struts.util.RequestUtils; import javax.servlet.jsp.JspException; 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=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java&r2=124619 ============================================================================== --- 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 7 19:59:20 2005 @@ -25,8 +25,8 @@ import org.apache.beehive.netui.util.Bundle; import org.apache.beehive.netui.util.logging.Logger; import org.apache.struts.Globals; -import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; import org.apache.struts.config.ControllerConfig; import org.apache.struts.config.ModuleConfig; import org.apache.struts.taglib.html.Constants; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Errors.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Errors.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Errors.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Errors.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Errors.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Errors.java Fri Jan 7 19:59:20 2005 @@ -19,9 +19,8 @@ import org.apache.beehive.netui.util.Bundle; import org.apache.struts.Globals; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionError; import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMessage; import org.apache.struts.util.RequestUtils; import javax.servlet.jsp.JspException; 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=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java&r2=124619 ============================================================================== --- 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 7 19:59:20 2005 @@ -25,9 +25,9 @@ import org.apache.beehive.netui.pageflow.internal.InternalConstants; import org.apache.beehive.netui.pageflow.internal.InternalUtils; 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.rendering.*; -import org.apache.beehive.netui.tags.TagConfig; import org.apache.beehive.netui.util.Bundle; import org.apache.beehive.netui.util.ParamHelper; import org.apache.beehive.netui.util.logging.Logger; @@ -844,8 +844,8 @@ else { idScript = script; } - } - return idScript; + } + return idScript; } @@ -930,13 +930,13 @@ PageFlowTagUtils.MappingAndController mac = PageFlowTagUtils.getActionMapping(request, _flowController, _state.action); if (mac == null) { FlowController globalApp = PageFlowUtils.getSharedFlow(InternalConstants.GLOBALAPP_CLASSNAME, request); - mac = PageFlowTagUtils.getActionMapping( request, globalApp, _state.action ); + mac = PageFlowTagUtils.getActionMapping(request, globalApp, _state.action); } if (mac == null) { registerTagError(Bundle.getString("Tags_BadAction", _state.action), null); return; } - + _flowController = mac.controller; _mapping = mac.mapping; _appConfig = _mapping.getModuleConfig(); 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=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java&r2=124619 ============================================================================== --- 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 Fri Jan 7 19:59:20 2005 @@ -20,10 +20,10 @@ import org.apache.beehive.netui.tags.AbstractPageError; import org.apache.beehive.netui.tags.ErrorHandling; import org.apache.beehive.netui.tags.IErrorReporter; +import org.apache.beehive.netui.tags.rendering.AbstractHtmlState; import org.apache.beehive.netui.tags.rendering.HtmlTag; import org.apache.beehive.netui.tags.rendering.TagRenderingBase; import org.apache.beehive.netui.tags.rendering.WriteRenderAppender; -import org.apache.beehive.netui.tags.rendering.AbstractHtmlState; import org.apache.beehive.netui.util.Bundle; import org.apache.struts.Globals; 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=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java&r2=124619 ============================================================================== --- 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 7 19:59:20 2005 @@ -530,8 +530,8 @@ else { idScript = script; } - } - return idScript; + } + return idScript; } /** 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=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/JavaScriptUtils.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/JavaScriptUtils.java&r2=124619 ============================================================================== --- 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 Fri Jan 7 19:59:20 2005 @@ -33,15 +33,15 @@ public class JavaScriptUtils implements Serializable { // bit positions for the JavaScript features that can be written out. - private static final int LEGACY_LOOKUP = 0x0001; - private static final int ID_LOOKUP = 0x0002; - private static final int NAME_LOOKUP = 0x0004; - private static final int SCOPE_LOOKUP = 0x0008; - private static final int ROLLOVER = 0x0010; - private static final int ANCHOR_SUBMIT = 0x0020; - private static final int ALLOCATE_LEGACY = 0x0040; - private static final int ALLOCATE_ID = 0x0080; - private static final int ALLOCATE_NAME = 0x0100; + private static final int LEGACY_LOOKUP = 0x0001; + private static final int ID_LOOKUP = 0x0002; + private static final int NAME_LOOKUP = 0x0004; + private static final int SCOPE_LOOKUP = 0x0008; + private static final int ROLLOVER = 0x0010; + private static final int ANCHOR_SUBMIT = 0x0020; + private static final int ALLOCATE_LEGACY = 0x0040; + private static final int ALLOCATE_ID = 0x0080; + private static final int ALLOCATE_NAME = 0x0100; private static final String BUNDLE_NAME = "org.apache.beehive.netui.tags.html.javaScript"; @@ -52,7 +52,6 @@ private static ResourceBundle _bundle; /** - * * @param scriptReporter * @param results */ @@ -78,7 +77,6 @@ } /** - * * @param action * @param newAction * @return @@ -113,16 +111,16 @@ /** * 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 tagId the tagId value + * @param value the "real" value of the written out * @param results the JavaScript that will be output */ public void getTagIdMapping(String tagId, String value, AbstractRenderAppender results) { if ((_javaScriptFeatures & ALLOCATE_LEGACY) == 0) { _javaScriptFeatures |= ALLOCATE_LEGACY; - String s = getString("singleIdMappingTable", new Object[] {tagId, value}); - String meths = writeNetuiNameFunctions(null,true,false,false); + String s = getString("singleIdMappingTable", new Object[]{tagId, value}); + String meths = writeNetuiNameFunctions(null, true, false, false); if (meths != null) s += meths; writeScriptBlock(results, s); @@ -135,7 +133,6 @@ } /** - * * @param tagId * @param realId * @param realName @@ -152,7 +149,8 @@ if (meths != null) s += meths; sb.append(s); - } else { + } + else { String s = getString("tagIdMappingEntry", new Object[]{tagId, realId}); sb.append(s); } @@ -161,8 +159,8 @@ if (realName != null) { if ((_javaScriptFeatures & ALLOCATE_NAME) == 0) { _javaScriptFeatures |= ALLOCATE_NAME; - String s = getString("singleIdToNameMappingTable", new Object[] {tagId, realName}); - String meths = writeNetuiNameFunctions(null,false,false,true); + String s = getString("singleIdToNameMappingTable", new Object[]{tagId, realName}); + String meths = writeNetuiNameFunctions(null, false, false, true); if (meths != null) s += meths; sb.append(s); @@ -176,7 +174,6 @@ } /** - * * @param scriptReporter * @param results */ @@ -198,7 +195,6 @@ } /** - * * @param scriptRepoter * @param mapObj * @param entries @@ -215,7 +211,6 @@ } /** - * * @param scriptReporter * @param writeLegacy * @param writeId @@ -231,19 +226,19 @@ // if we are supporting legacy javascript then output the original javascript method if (TagConfig.isLegacyJavaScript() && writeLegacy) { - writeLookupMethod(scriptReporter,sb,"getNetuiTagNameAdvanced",LEGACY_LOOKUP); + writeLookupMethod(scriptReporter, sb, "getNetuiTagNameAdvanced", LEGACY_LOOKUP); } // if we are supporting the default javascript then output the lookup methods for id and name if (TagConfig.isDefaultJavaScript()) { if (writeId) - writeLookupMethod(scriptReporter,sb,"lookupIdByTagId",ID_LOOKUP); + writeLookupMethod(scriptReporter, sb, "lookupIdByTagId", ID_LOOKUP); if (writeName) - writeLookupMethod(scriptReporter,sb,"lookupNameByTagId",NAME_LOOKUP); + writeLookupMethod(scriptReporter, sb, "lookupNameByTagId", NAME_LOOKUP); } - writeLookupMethod(scriptReporter,sb,"getScopeId",SCOPE_LOOKUP); + writeLookupMethod(scriptReporter, sb, "getScopeId", SCOPE_LOOKUP); return (sb != null) ? sb.toString() : null; } @@ -263,7 +258,6 @@ } /** - * * @param results */ public static void writeScriptStart(AbstractRenderAppender results) @@ -273,7 +267,6 @@ } /** - * * @param results */ public static void writeScriptEnd(AbstractRenderAppender results) @@ -312,7 +305,7 @@ return _bundle; } - private void writeLookupMethod(IScriptReporter scriptReporter,StringBuilder sb,String bundleString, int feature) + private void writeLookupMethod(IScriptReporter scriptReporter, StringBuilder sb, String bundleString, int feature) { if ((_javaScriptFeatures & feature) != 0) 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=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java&r2=124619 ============================================================================== --- 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 Fri Jan 7 19:59:20 2005 @@ -92,7 +92,7 @@ try { boolean needsToBeSecure = false; uri = new MutableURI(url); - uri.setEncoding( response.getCharacterEncoding() ); + uri.setEncoding(response.getCharacterEncoding()); if (!uri.isAbsolute() && PageFlowTagUtils.needsSecure(context, request, url, true)) { needsToBeSecure = true; } 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=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java&r2=124619 ============================================================================== --- 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 Fri Jan 7 19:59:20 2005 @@ -267,7 +267,8 @@ * @netui:attribute required="false" rtexprvalue="true" * description="Automatically generate a ScopeId." */ - public void setGenerateScopeId(boolean genScopeValue) { + public void setGenerateScopeId(boolean genScopeValue) + { _genScope = genScopeValue; } 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=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java&r2=124619 ============================================================================== --- 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 7 19:59:20 2005 @@ -185,8 +185,9 @@ { Tag parentTag = getParent(); - while (!(parentTag instanceof Select)) + while (!(parentTag instanceof Select)) { parentTag = parentTag.getParent(); + } if (parentTag == null) { //throw error @@ -255,8 +256,9 @@ // the parent was validated in the doStartTag call Tag parentTag = getParent(); - while (!(parentTag instanceof Select)) + while (!(parentTag instanceof Select)) { parentTag = parentTag.getParent(); + } assert (parentTag instanceof Select); Select parentSelect = (Select) parentTag; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/PageFlowTagUtils.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/PageFlowTagUtils.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/PageFlowTagUtils.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/PageFlowTagUtils.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/PageFlowTagUtils.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/PageFlowTagUtils.java Fri Jan 7 19:59:20 2005 @@ -21,27 +21,25 @@ import org.apache.beehive.netui.core.urls.URLRewriter.URLType; import org.apache.beehive.netui.core.urls.URLRewriterService; import org.apache.beehive.netui.pageflow.FlowController; -import org.apache.beehive.netui.pageflow.FlowControllerFactory; import org.apache.beehive.netui.pageflow.PageFlowConstants; import org.apache.beehive.netui.pageflow.PageFlowUtils; import org.apache.beehive.netui.pageflow.SecurityProtocol; -import org.apache.beehive.netui.pageflow.SharedFlowController; import org.apache.beehive.netui.pageflow.config.PageFlowActionMapping; -import org.apache.beehive.netui.pageflow.internal.InternalUtils; import org.apache.beehive.netui.pageflow.internal.InternalConstants; +import org.apache.beehive.netui.pageflow.internal.InternalUtils; +import org.apache.struts.Globals; import org.apache.struts.action.ActionMapping; import org.apache.struts.config.ActionConfig; import org.apache.struts.util.TokenProcessor; -import org.apache.struts.Globals; -import java.net.URISyntaxException; -import java.util.Map; -import javax.servlet.jsp.PageContext; import javax.servlet.ServletContext; import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import javax.servlet.jsp.PageContext; +import java.net.URISyntaxException; +import java.util.Map; /** * This is a utility class for the beehive tags with routines for helping with URL rewriting. @@ -53,37 +51,37 @@ public class PageFlowTagUtils { /** - * Create a mutable url object from an initial action url with query parameters + * Create a mutable url object from an initial action url with query parameters * and an anchor (location on page), checking if it needs to be secure then call * the rewriter service using a type of [EMAIL PROTECTED] URLType.ACTION}. - * - * @param pageContext the current PageContext. - * @param action the action url to rewrite. - * @param params the query parameters for this url. - * @param location the location (anchor or fragment) for this url. + * @param pageContext the current PageContext. + * @param action the action url to rewrite. + * @param params the query parameters for this url. + * @param location the location (anchor or fragment) for this url. * @return a mutable uri that has been run through the URL rewriter service. */ - public static MutableURI rewriteActionURL( PageContext pageContext, String action, Map params, String location ) + public static MutableURI rewriteActionURL(PageContext pageContext, String action, Map params, String location) throws URISyntaxException { ServletContext servletContext = pageContext.getServletContext(); ServletRequest request = pageContext.getRequest(); - HttpServletResponse response = ( HttpServletResponse ) pageContext.getResponse(); - String qualifiedAction = InternalUtils.qualifyAction( servletContext, action ); - String actionUrl = InternalUtils.createActionURL( ( HttpServletRequest ) request, qualifiedAction ); - MutableURI uri = new MutableURI( actionUrl ); - uri.setEncoding( response.getCharacterEncoding() ); - - if ( params != null ) - { - uri.addParameters( params, false ); - } - - if ( location != null ) { uri.setFragment( location ); } - - boolean needsToBeSecure = needsSecure( servletContext, request, actionUrl, true ); - URLRewriterService.rewriteURL( servletContext, request, response, uri, - URLType.ACTION, needsToBeSecure ); + HttpServletResponse response = (HttpServletResponse) pageContext.getResponse(); + String qualifiedAction = InternalUtils.qualifyAction(servletContext, action); + String actionUrl = InternalUtils.createActionURL((HttpServletRequest) request, qualifiedAction); + MutableURI uri = new MutableURI(actionUrl); + uri.setEncoding(response.getCharacterEncoding()); + + if (params != null) { + uri.addParameters(params, false); + } + + if (location != null) { + uri.setFragment(location); + } + + boolean needsToBeSecure = needsSecure(servletContext, request, actionUrl, true); + URLRewriterService.rewriteURL(servletContext, request, response, uri, + URLType.ACTION, needsToBeSecure); return uri; } @@ -92,93 +90,90 @@ * Create a mutable url object from an initial href url with query parameters * and an anchor (location on page), checking if it needs to be secure then call * the rewriter service using a type of [EMAIL PROTECTED] URLType.ACTION}. - * - * @param pageContext the current PageContext. - * @param url the href url to rewrite. - * @param params the query parameters for this url. - * @param location the location (anchor or fragment) for this url. + * @param pageContext the current PageContext. + * @param url the href url to rewrite. + * @param params the query parameters for this url. + * @param location the location (anchor or fragment) for this url. * @return a mutable uri that has been run through the URL rewriter service. */ - public static MutableURI rewriteHrefURL( PageContext pageContext, String url, Map params, String location ) + public static MutableURI rewriteHrefURL(PageContext pageContext, String url, Map params, String location) throws URISyntaxException { - return rewriteResourceOrHrefURL( pageContext, url, params, location, URLType.ACTION ); + return rewriteResourceOrHrefURL(pageContext, url, params, location, URLType.ACTION); } /** * Create a mutable url object from an initial resource url with query parameters * and an anchor (location on page), checking if it needs to be secure then call * the rewriter service using a type of [EMAIL PROTECTED] URLType.RESOURCE}. - * - * @param pageContext the current PageContext. - * @param url the resource url to rewrite. - * @param params the query parameters for this url. - * @param location the location (anchor or fragment) for this url. + * @param pageContext the current PageContext. + * @param url the resource url to rewrite. + * @param params the query parameters for this url. + * @param location the location (anchor or fragment) for this url. * @return a mutable uri that has been run through the URL rewriter service. */ - public static MutableURI rewriteResourceURL( PageContext pageContext, String url, Map params, String location ) + public static MutableURI rewriteResourceURL(PageContext pageContext, String url, Map params, String location) throws URISyntaxException { - return rewriteResourceOrHrefURL( pageContext, url, params, location, URLType.RESOURCE ); + return rewriteResourceOrHrefURL(pageContext, url, params, location, URLType.RESOURCE); } - private static MutableURI rewriteResourceOrHrefURL( PageContext pageContext, String url, Map params, - String location, URLType type ) + private static MutableURI rewriteResourceOrHrefURL(PageContext pageContext, String url, Map params, + String location, URLType type) throws URISyntaxException { - HttpServletResponse response = ( HttpServletResponse ) pageContext.getResponse(); - MutableURI uri = new MutableURI( url ); - uri.setEncoding( response.getCharacterEncoding() ); + HttpServletResponse response = (HttpServletResponse) pageContext.getResponse(); + MutableURI uri = new MutableURI(url); + uri.setEncoding(response.getCharacterEncoding()); - if ( params != null ) - { - uri.addParameters( params, false ); + if (params != null) { + uri.addParameters(params, false); } - if ( location != null ) { uri.setFragment( location ); } + if (location != null) { + uri.setFragment(location); + } - if ( uri.isAbsolute() ) { return uri; } + if (uri.isAbsolute()) { + return uri; + } - HttpServletRequest request = ( HttpServletRequest ) pageContext.getRequest(); - if ( !url.startsWith( "/" ) && !url.equals( "" ) ) - { + HttpServletRequest request = (HttpServletRequest) pageContext.getRequest(); + if (!url.startsWith("/") && !url.equals("")) { String reqUri = request.getRequestURI(); - String path = reqUri.substring( 0, reqUri.lastIndexOf( '/' ) + 1 ); - uri.setPath( path + uri.getPath() ); + String path = reqUri.substring(0, reqUri.lastIndexOf('/') + 1); + uri.setPath(path + uri.getPath()); } ServletContext servletContext = pageContext.getServletContext(); - boolean needsToBeSecure = needsSecure( servletContext, request, url, true ); - URLRewriterService.rewriteURL( servletContext, request, response, uri, - type, needsToBeSecure ); + boolean needsToBeSecure = needsSecure(servletContext, request, url, true); + URLRewriterService.rewriteURL(servletContext, request, response, uri, + type, needsToBeSecure); return uri; } /** * Determine whether a given URI is an Action. - * - * @param request the current HttpServletRequest. - * @param action the URI to check. + * @param request the current HttpServletRequest. + * @param action the URI to check. * @return <code>true</code> if the action is defined in the current page flow * or in a shared flow. Otherwise, return <code>false</code>. */ - public static boolean isAction( HttpServletRequest request, String action ) + public static boolean isAction(HttpServletRequest request, String action) { - FlowController flowController = InternalUtils.getCurrentPageFlow( request, false ); - - if ( flowController != null ) - { - if ( action.endsWith( PageFlowConstants.ACTION_EXTENSION ) ) - { - action = action.substring( 0, action.length() - PageFlowConstants.ACTION_EXTENSION.length() ); + FlowController flowController = InternalUtils.getCurrentPageFlow(request, false); + + if (flowController != null) { + if (action.endsWith(PageFlowConstants.ACTION_EXTENSION)) { + action = action.substring(0, action.length() - PageFlowConstants.ACTION_EXTENSION.length()); } - - if ( getActionMapping( request, flowController, action ) != null ) return true; - FlowController globalApp = PageFlowUtils.getSharedFlow( InternalConstants.GLOBALAPP_CLASSNAME, request ); - return getActionMapping( request, globalApp, action ) != null; + + if (getActionMapping(request, flowController, action) != null) return true; + FlowController globalApp = PageFlowUtils.getSharedFlow(InternalConstants.GLOBALAPP_CLASSNAME, request); + return getActionMapping(request, globalApp, action) != null; } - + return true; } @@ -186,119 +181,108 @@ * Get or generate a token used to prevent double submits to an action. The token is stored in the session, * and checked (and removed) when processing an action with the <code>preventDoubleSubmit</code> attribute * set to <code>true</code>. - */ - public static String getToken( HttpServletRequest request, String action ) + */ + public static String getToken(HttpServletRequest request, String action) { - FlowController flowController = InternalUtils.getCurrentPageFlow( request, false ); - - if ( flowController != null ) - { - MappingAndController mac = getActionMapping( request, flowController, action ); - if ( mac != null ) return getToken( request, mac.mapping ); + FlowController flowController = InternalUtils.getCurrentPageFlow(request, false); + + if (flowController != null) { + MappingAndController mac = getActionMapping(request, flowController, action); + if (mac != null) return getToken(request, mac.mapping); } - + return null; } - + /** * Get or generate a token used to prevent double submits to an action. The token is stored in the session, * and checked (and removed) when processing an action with the <code>preventDoubleSubmit</code> attribute * set to <code>true</code>. - */ - public static String getToken( HttpServletRequest request, ActionMapping mapping ) + */ + public static String getToken(HttpServletRequest request, ActionMapping mapping) { - if ( mapping instanceof PageFlowActionMapping && ( ( PageFlowActionMapping ) mapping ).isPreventDoubleSubmit() ) - { + if (mapping instanceof PageFlowActionMapping && ((PageFlowActionMapping) mapping).isPreventDoubleSubmit()) { HttpSession session = request.getSession(); - String token = ( String ) session.getAttribute( Globals.TRANSACTION_TOKEN_KEY ); - if ( token != null ) return token; - token = TokenProcessor.getInstance().generateToken( request ); - request.getSession().setAttribute( Globals.TRANSACTION_TOKEN_KEY, token ); + String token = (String) session.getAttribute(Globals.TRANSACTION_TOKEN_KEY); + if (token != null) return token; + token = TokenProcessor.getInstance().generateToken(request); + request.getSession().setAttribute(Globals.TRANSACTION_TOKEN_KEY, token); return token; } - + return null; } - + public static class MappingAndController { public ActionMapping mapping; public FlowController controller; } - - public static MappingAndController getActionMapping( HttpServletRequest request, FlowController flowController, String action ) + + public static MappingAndController getActionMapping(HttpServletRequest request, FlowController flowController, String action) { ActionConfig mapping = null; FlowController fc = null; - - if ( flowController != null ) - { + + if (flowController != null) { // // If there's a '.' delimiter, it's a shared flow action. // - int dot = action.indexOf( '.' ); - - if ( dot == -1 ) - { + int dot = action.indexOf('.'); + + if (dot == -1) { // // It's an action in the current page flow, or in the (deprecated) Global.app. // - if ( action.charAt( 0 ) != '/' ) action = '/' + action; - mapping = flowController.getModuleConfig().findActionConfig( action ); + if (action.charAt(0) != '/') action = '/' + action; + mapping = flowController.getModuleConfig().findActionConfig(action); fc = flowController; // // If we don't find it in the current page flow, look in Global.app. // - if ( mapping == null ) - { + if (mapping == null) { FlowController globalApp = - PageFlowUtils.getSharedFlow( InternalConstants.GLOBALAPP_CLASSNAME, request ); - if ( globalApp != null ) - { - mapping = globalApp.getModuleConfig().findActionConfig( action ); + PageFlowUtils.getSharedFlow(InternalConstants.GLOBALAPP_CLASSNAME, request); + if (globalApp != null) { + mapping = globalApp.getModuleConfig().findActionConfig(action); fc = globalApp; } } } - else if ( dot < action.length() - 1 ) - { + else if (dot < action.length() - 1) { // // It's an action in a shared flow. // - String sharedFlowName = action.substring( 0, dot ); - if ( sharedFlowName.length() > 0 && sharedFlowName.charAt( 0 ) == '/' ) - { - sharedFlowName = sharedFlowName.substring( 1 ); + String sharedFlowName = action.substring(0, dot); + if (sharedFlowName.length() > 0 && sharedFlowName.charAt(0) == '/') { + sharedFlowName = sharedFlowName.substring(1); } - FlowController sharedFlow = PageFlowUtils.getSharedFlows( request ).get( sharedFlowName ); - - if ( sharedFlow != null ) - { - String actionPath = '/' + action.substring( dot + 1 ); - mapping = sharedFlow.getModuleConfig().findActionConfig( actionPath ); + FlowController sharedFlow = PageFlowUtils.getSharedFlows(request).get(sharedFlowName); + + if (sharedFlow != null) { + String actionPath = '/' + action.substring(dot + 1); + mapping = sharedFlow.getModuleConfig().findActionConfig(actionPath); fc = sharedFlow; } } } - + assert mapping == null || mapping instanceof ActionMapping : mapping.getClass().getName(); - - if ( mapping != null ) - { + + if (mapping != null) { MappingAndController mac = new MappingAndController(); - mac.mapping = ( ActionMapping ) mapping; + mac.mapping = (ActionMapping) mapping; mac.controller = fc; return mac; } - + return null; } - + /** * Tell whether a given URI should be written to be secure. - * * @param request the current HttpServletRequest. * @param context the current ServletContext. * @param uri the URI to check. @@ -321,34 +305,29 @@ * <code>false</code>). * </ul> */ - public static boolean needsSecure( ServletContext context, ServletRequest request, - String uri, boolean stripContextPath ) + public static boolean needsSecure(ServletContext context, ServletRequest request, + String uri, boolean stripContextPath) { // Get the web-app relative path for security check String secureCheck = uri; - if ( stripContextPath ) - { - String contextPath = ( ( HttpServletRequest ) request ).getContextPath(); - if ( secureCheck.startsWith( contextPath ) ) - { - secureCheck = secureCheck.substring( contextPath.length() ); + if (stripContextPath) { + String contextPath = ((HttpServletRequest) request).getContextPath(); + if (secureCheck.startsWith(contextPath)) { + secureCheck = secureCheck.substring(contextPath.length()); } } boolean secure = false; - if ( secureCheck.indexOf( '?' ) > -1 ) - { - secureCheck = secureCheck.substring( 0, secureCheck.indexOf( '?' ) ); + if (secureCheck.indexOf('?') > -1) { + secureCheck = secureCheck.substring(0, secureCheck.indexOf('?')); } - SecurityProtocol sp = PageFlowUtils.getSecurityProtocol( secureCheck, context, ( HttpServletRequest ) request ); - if ( sp.equals( SecurityProtocol.UNSPECIFIED ) ) - { + SecurityProtocol sp = PageFlowUtils.getSecurityProtocol(secureCheck, context, (HttpServletRequest) request); + if (sp.equals(SecurityProtocol.UNSPECIFIED)) { secure = request.isSecure(); } - else - { - secure = sp.equals( SecurityProtocol.SECURE ); + else { + secure = sp.equals(SecurityProtocol.SECURE); } return secure; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/FormDataNameInterceptor.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/FormDataNameInterceptor.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/FormDataNameInterceptor.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/FormDataNameInterceptor.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/FormDataNameInterceptor.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/FormDataNameInterceptor.java Fri Jan 7 19:59:20 2005 @@ -17,10 +17,9 @@ */ package org.apache.beehive.netui.tags.naming; -import org.apache.beehive.netui.script.ExpressionEvaluator; import org.apache.beehive.netui.script.ExpressionEvaluationException; +import org.apache.beehive.netui.script.ExpressionEvaluator; import org.apache.beehive.netui.script.ExpressionEvaluatorFactory; - import org.apache.beehive.netui.util.logging.Logger; import javax.servlet.jsp.tagext.Tag; @@ -49,23 +48,23 @@ * Qualify the name of a NetUI JSP tag into the "actionForm" data binding context. * This feature is used to convert non-expression tag names, as those used in Struts, * into actionForm expressions that NetUI consumes. - * * @param name the name to qualify into the actionForm binding context. If this is "foo", the returned value - * is {actionForm.foo} + * is {actionForm.foo} * @return the qualified name or <code>null</code> if an error occurred */ - public String rewriteName(String name,Tag currentTag) - throws ExpressionEvaluationException { + public String rewriteName(String name, Tag currentTag) + throws ExpressionEvaluationException + { ExpressionEvaluator eval = ExpressionEvaluatorFactory.getInstance(); try { if (!eval.isExpression(name)) - return eval.qualify("actionForm",name); + return eval.qualify("actionForm", name); return name; } catch (Exception e) { if (logger.isErrorEnabled()) - logger.error("Could not qualify name \""+name+"\" into the actionForm binding context.",e); + logger.error("Could not qualify name \"" + name + "\" into the actionForm binding context.", e); // return the Struts name. This should cause regular Struts databinding to execute so this property will // be updated anyway. Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/IndexedNameInterceptor.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/IndexedNameInterceptor.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/IndexedNameInterceptor.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/IndexedNameInterceptor.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/IndexedNameInterceptor.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/IndexedNameInterceptor.java Fri Jan 7 19:59:20 2005 @@ -18,22 +18,18 @@ package org.apache.beehive.netui.tags.naming; // java imports -import java.util.List; - -import javax.servlet.jsp.tagext.Tag; -import javax.servlet.jsp.tagext.TagSupport; -import javax.servlet.jsp.tagext.SimpleTagSupport; -// internal imports import org.apache.beehive.netui.script.Expression; -import org.apache.beehive.netui.script.ExpressionEvaluator; import org.apache.beehive.netui.script.ExpressionEvaluationException; +import org.apache.beehive.netui.script.ExpressionEvaluator; import org.apache.beehive.netui.script.ExpressionEvaluatorFactory; - import org.apache.beehive.netui.script.common.IDataAccessProvider; - import org.apache.beehive.netui.util.logging.Logger; +import javax.servlet.jsp.tagext.SimpleTagSupport; +import javax.servlet.jsp.tagext.Tag; +import java.util.List; + // external imports /** @@ -54,21 +50,20 @@ /** * Rewrite an expression into a fully-qualified reference to a specific JavaBean property - * on an object. - * - * @param name the expression to rewrite - * @param currentTag the current JSP tag that can be used as the leaf for walking up - * to find parent tags that provide information used to + * on an object. + * @param name the expression to rewrite + * @param currentTag the current JSP tag that can be used as the leaf for walking up + * to find parent tags that provide information used to * rewrite the expression. */ public final String rewriteName(String name, Tag currentTag) - throws ExpressionEvaluationException + throws ExpressionEvaluationException { - if(_logger.isDebugEnabled()) _logger.debug("rewrite expression \"" + name + "\""); + if (_logger.isDebugEnabled()) _logger.debug("rewrite expression \"" + name + "\""); IDataAccessProvider dap = getCurrentProvider(currentTag); // if the DAP is null, there is no rewriting to do - if(dap == null) + if (dap == null) return name; // given a hierarchy of "container.container.container.item.someProp", the correct parent needs @@ -80,23 +75,22 @@ int containerCount = 0; List tokens = parsed.getTokens(); - for(int i = 0; i < tokens.size(); i++) - { + for (int i = 0; i < tokens.size(); i++) { String tok = tokens.get(i).toString(); - if(i == 0) - { - if(!tok.equals("container")) + if (i == 0) { + if (!tok.equals("container")) break; - else continue; + else + continue; } // this skips the "current" IDataAccessProvider - else if(tok.equals("container")) + else if (tok.equals("container")) containerCount++; - else if(tok.equals("item")) + else if (tok.equals("item")) break; } - if(_logger.isDebugEnabled()) _logger.debug("container parent count: " + containerCount); + if (_logger.isDebugEnabled()) _logger.debug("container parent count: " + containerCount); // now walk up the DataAccessProvier hierarchy until the top-most parent is found // the top-most parent is the first one that does not reference "container.item" but @@ -107,8 +101,7 @@ // DAPs in order to find the correct root from which to start. // // In general, containerCount is zero here for the "container.item.foo" case. - for(int i = 0; i < containerCount; i++) - { + for (int i = 0; i < containerCount; i++) { dap = dap.getProviderParent(); } @@ -117,8 +110,7 @@ // strip off the "container.item" from the expression that is being rewritten // this should be two tokens into the expression. - if(containerCount > 0) - { + if (containerCount > 0) { name = parsed.getExpression(containerCount); } @@ -128,25 +120,25 @@ // is derived entirely from the IDataAccessProvider parent hierarchy. String parentNames = rewriteNameInternal(dap); - if(_logger.isDebugEnabled()) _logger.debug("name hierarchy: " + parentNames + " name: " +name); + if (_logger.isDebugEnabled()) _logger.debug("name hierarchy: " + parentNames + " name: " + name); // with a newly re-written expression prefix, substitute this fully-qualified binding // string into the given expression for "container.item". String newName = changeContext(name, "container.item", parentNames, dap.getCurrentIndex()); - if(_logger.isDebugEnabled()) _logger.debug("rewrittenName: " + newName); + if (_logger.isDebugEnabled()) _logger.debug("rewrittenName: " + newName); return newName; } /** - * A default method to find the "current" IDataAccessProvider. This method is - * left as non-final so that the implementation here can be tested + * A default method to find the "current" IDataAccessProvider. This method is + * left as non-final so that the implementation here can be tested * outside of a servlet container. */ - protected IDataAccessProvider getCurrentProvider(Tag tag) + protected IDataAccessProvider getCurrentProvider(Tag tag) { - return (IDataAccessProvider)SimpleTagSupport.findAncestorWithClass(tag,IDataAccessProvider.class); + return (IDataAccessProvider) SimpleTagSupport.findAncestorWithClass(tag, IDataAccessProvider.class); } /** @@ -155,9 +147,9 @@ * "container.container.container.container.item.foo" -> "DS1.DS2.DS3.DS4.foo" */ private final String rewriteNameInternal(IDataAccessProvider dap) - throws ExpressionEvaluationException + throws ExpressionEvaluationException { - if(_logger.isDebugEnabled()) + if (_logger.isDebugEnabled()) _logger.debug("assign index to name: " + dap.getDataSource()); Expression parsedDataSource = getExpressionEvaluator().parseExpression(dap.getDataSource()); @@ -169,22 +161,20 @@ // rewrite the name of the current IDataAccessProvider. String parentName = null; // if the current DAP has a parent IDataAccessProvider, rewrite the name of the parent - if(dap.getProviderParent() != null) + if (dap.getProviderParent() != null) parentName = rewriteNameInternal(dap.getProviderParent()); // if the current DAP has no parent, or it does not reference the "container." binding context, // we've found the "root" IDataAccessProvider - else if(dap.getProviderParent() == null || (dap.getProviderParent() != null && !isContainerBound)) - { + else if (dap.getProviderParent() == null || (dap.getProviderParent() != null && !isContainerBound)) { return dap.getDataSource(); } // now, we've found the root and can start rewriting the expressions throughout // the rest of the DAP hierarchy - if(_logger.isDebugEnabled()) - { + if (_logger.isDebugEnabled()) { _logger.debug("changeContext: DAP.dataSource=" + dap.getDataSource() + " oldContext=container newContext=" + - parentName + " currentIndex=" + dap.getProviderParent().getCurrentIndex() + - " parentName is container: " + isContainerBound); + parentName + " currentIndex=" + dap.getProviderParent().getCurrentIndex() + + " parentName is container: " + isContainerBound); } String retVal = null; @@ -197,15 +187,15 @@ // "actionForm.customers[12]". boolean isContainerItemBound = false; - if(isContainerBound && (parsedDataSource.getTokens().get(1)).toString().equals("item")) + if (isContainerBound && (parsedDataSource.getTokens().get(1)).toString().equals("item")) isContainerItemBound = true; - - if(isContainerItemBound) + + if (isContainerItemBound) retVal = changeContext(ds, "container.item", parentName, dap.getProviderParent().getCurrentIndex()); else retVal = changeContext(ds, "container", parentName, dap.getProviderParent().getCurrentIndex()); - if(_logger.isDebugEnabled()) _logger.debug("fully-qualified binding expression: \"" + retVal + "\""); + if (_logger.isDebugEnabled()) _logger.debug("fully-qualified binding expression: \"" + retVal + "\""); return retVal; } @@ -216,16 +206,15 @@ } private final String changeContext(String dataSource, String oldContext, String newContext, int index) - throws ExpressionEvaluationException + throws ExpressionEvaluationException { - try - { + try { return getExpressionEvaluator().changeContext(dataSource, oldContext, newContext, index); } - catch (ExpressionEvaluationException ee) - { - if(_logger.isErrorEnabled()) _logger.error("An error occurred changing the binding context of the expression \"" + - dataSource + "\". Cause: " + ee, ee); + catch (ExpressionEvaluationException ee) { + if (_logger.isErrorEnabled()) + _logger.error("An error occurred changing the binding context of the expression \"" + + dataSource + "\". Cause: " + ee, ee); throw ee; } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/NameInterceptor.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/NameInterceptor.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/NameInterceptor.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/NameInterceptor.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/NameInterceptor.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/NameInterceptor.java Fri Jan 7 19:59:20 2005 @@ -29,7 +29,6 @@ * Several concrete implementations of this interface are * provided in order to rewrite names on form tags as they * are rendered to the browser. - * * @see FormDataNameInterceptor * @see IndexedNameInterceptor * @see PrefixNameInterceptor @@ -38,11 +37,10 @@ { /** - * * @param name * @param currentTag * @return String * @throws ExpressionEvaluationException */ - public String rewriteName(String name,Tag currentTag) throws ExpressionEvaluationException; + public String rewriteName(String name, Tag currentTag) throws ExpressionEvaluationException; } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/PrefixNameInterceptor.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/PrefixNameInterceptor.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/PrefixNameInterceptor.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/PrefixNameInterceptor.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/PrefixNameInterceptor.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/PrefixNameInterceptor.java Fri Jan 7 19:59:20 2005 @@ -38,21 +38,25 @@ { private String tagKey; - public PrefixNameInterceptor(String key) { + public PrefixNameInterceptor(String key) + { tagKey = key; } - protected PrefixNameInterceptor() { + protected PrefixNameInterceptor() + { super(); } - public String rewriteName(String name,Tag currentTag) - throws ExpressionEvaluationException { - return rewriteNameInternal(name,tagKey); + public String rewriteName(String name, Tag currentTag) + throws ExpressionEvaluationException + { + return rewriteNameInternal(name, tagKey); } - protected String rewriteNameInternal(String name,String key) - throws ExpressionEvaluationException { - return org.apache.beehive.netui.pageflow.ProcessPopulate.writeHandlerName(key,name); + protected String rewriteNameInternal(String name, String key) + throws ExpressionEvaluationException + { + return org.apache.beehive.netui.pageflow.ProcessPopulate.writeHandlerName(key, name); } } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractAttributeState.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractAttributeState.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractAttributeState.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractAttributeState.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractAttributeState.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractAttributeState.java Fri Jan 7 19:59:20 2005 @@ -85,7 +85,7 @@ assert(attrName != null); // If the value is null or the empty string ignore the expression. - if (value == null ) + if (value == null) return; if (ignoreEmpty && "".equals(value)) return; @@ -102,7 +102,7 @@ public void registerAttribute(int type, String attrName, String value) { - registerAttribute(type,attrName,value,true); + registerAttribute(type, attrName, value, true); } /** Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractRenderAppender.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractRenderAppender.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractRenderAppender.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractRenderAppender.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractRenderAppender.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractRenderAppender.java Fri Jan 7 19:59:20 2005 @@ -23,5 +23,6 @@ abstract public class AbstractRenderAppender { abstract public void append(String s); + abstract public void append(char c); } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/BodyTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/BodyTag.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/BodyTag.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/BodyTag.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/BodyTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/BodyTag.java Fri Jan 7 19:59:20 2005 @@ -19,7 +19,6 @@ import org.apache.beehive.netui.tags.html.HtmlConstants; -import javax.servlet.jsp.PageContext; import java.util.HashMap; /** Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/HtmlTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/HtmlTag.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/HtmlTag.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/HtmlTag.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/HtmlTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/HtmlTag.java Fri Jan 7 19:59:20 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.tags.rendering; import org.apache.beehive.netui.tags.html.HtmlConstants; + import java.util.HashMap; /** Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputBooleanTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputBooleanTag.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputBooleanTag.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputBooleanTag.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputBooleanTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputBooleanTag.java Fri Jan 7 19:59:20 2005 @@ -19,7 +19,6 @@ import org.apache.beehive.netui.tags.html.HtmlConstants; -import javax.servlet.jsp.PageContext; import java.util.HashMap; /** Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputSubmitTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputSubmitTag.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputSubmitTag.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputSubmitTag.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputSubmitTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputSubmitTag.java Fri Jan 7 19:59:20 2005 @@ -19,7 +19,6 @@ import org.apache.beehive.netui.tags.html.HtmlConstants; -import javax.servlet.jsp.PageContext; import java.util.HashMap; /** Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputTextTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputTextTag.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputTextTag.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputTextTag.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputTextTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputTextTag.java Fri Jan 7 19:59:20 2005 @@ -19,7 +19,6 @@ import org.apache.beehive.netui.tags.html.HtmlConstants; -import javax.servlet.jsp.PageContext; import java.util.HashMap; /** Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/OptionTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/OptionTag.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/OptionTag.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/OptionTag.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/OptionTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/OptionTag.java Fri Jan 7 19:59:20 2005 @@ -19,7 +19,6 @@ import org.apache.beehive.netui.tags.html.HtmlConstants; -import javax.servlet.jsp.PageContext; import java.util.HashMap; /** Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/SelectTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/SelectTag.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/SelectTag.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/SelectTag.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/SelectTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/SelectTag.java Fri Jan 7 19:59:20 2005 @@ -19,7 +19,6 @@ import org.apache.beehive.netui.tags.html.HtmlConstants; -import javax.servlet.jsp.PageContext; import java.util.HashMap; /** @@ -72,6 +71,7 @@ renderAttributes(AbstractHtmlState.ATTR_JAVASCRIPT, sb, state); sb.append(">"); } + public void doEndTag(AbstractRenderAppender sb) { renderEndTag(sb, SELECT); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/StringBuilderRenderAppender.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/StringBuilderRenderAppender.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/StringBuilderRenderAppender.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/StringBuilderRenderAppender.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/StringBuilderRenderAppender.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/StringBuilderRenderAppender.java Fri Jan 7 19:59:20 2005 @@ -22,7 +22,7 @@ * Strings to a [EMAIL PROTECTED] java.lang.StringBuilder} */ public class StringBuilderRenderAppender - extends AbstractRenderAppender + extends AbstractRenderAppender { private StringBuilder _sb; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/THeadTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/THeadTag.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/THeadTag.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/THeadTag.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/THeadTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/THeadTag.java Fri Jan 7 19:59:20 2005 @@ -26,7 +26,7 @@ * Required href */ public abstract class THeadTag - extends TagHtmlBase + extends TagHtmlBase { public static void add(HashMap html, HashMap htmlQuirks, HashMap xhtml) { @@ -44,7 +44,7 @@ } private static class Rendering - extends THeadTag implements HtmlConstants + extends THeadTag implements HtmlConstants { // @todo: need to support %coreattrs, %i18n, %events, %cellhalign, %cellvalign on <thead> public void doStartTag(AbstractRenderAppender sb, AbstractTagState renderState) Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagHtmlBase.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagHtmlBase.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagHtmlBase.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagHtmlBase.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagHtmlBase.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagHtmlBase.java Fri Jan 7 19:59:20 2005 @@ -17,7 +17,6 @@ */ package org.apache.beehive.netui.tags.rendering; -import javax.servlet.jsp.PageContext; import java.util.HashMap; abstract public class TagHtmlBase extends TagRenderingBase @@ -31,14 +30,14 @@ { HashMap map = null; switch (type) { - case AbstractHtmlState.ATTR_JAVASCRIPT: - assert(state instanceof AbstractHtmlState) : "ATTR_JAVASCRIPT requires a AbstractHtmlState instance"; - AbstractHtmlState htmlState = (AbstractHtmlState) state; - map = htmlState.getEventMap(); - break; - default: - super.renderAttributes(type, sb, state, doubleQuote); - return; + case AbstractHtmlState.ATTR_JAVASCRIPT: + assert(state instanceof AbstractHtmlState) : "ATTR_JAVASCRIPT requires a AbstractHtmlState instance"; + AbstractHtmlState htmlState = (AbstractHtmlState) state; + map = htmlState.getEventMap(); + break; + default: + super.renderAttributes(type, sb, state, doubleQuote); + return; } renderGeneral(map, sb, doubleQuote); } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java Fri Jan 7 19:59:20 2005 @@ -25,8 +25,8 @@ import org.apache.struts.util.ResponseUtils; import javax.servlet.ServletRequest; -import javax.servlet.jsp.PageContext; import javax.servlet.jsp.JspException; +import javax.servlet.jsp.PageContext; import java.util.HashMap; import java.util.Iterator; @@ -66,8 +66,9 @@ private static int _defaultDocType; - static { - _defaultDocType = HTML_RENDERING_QUIRKS; + static + { + _defaultDocType = HTML_RENDERING_QUIRKS; JspTagConfig tagConfig = ConfigUtil.getConfig().getJspTagConfig(); if (tagConfig != null) { String docType = tagConfig.getDoctype(); @@ -75,11 +76,13 @@ } } - public static int getDefaultDocType() { + public static int getDefaultDocType() + { return _defaultDocType; } - public static void setDefaultDocType(String docType) { + public static void setDefaultDocType(String docType) + { if (docType != null) { if (docType.equals(Html.HTML_401)) _defaultDocType = TagRenderingBase.HTML_RENDERING; @@ -184,6 +187,7 @@ buf.append(value); buf.append("\""); } + /** * @param buf * @param name @@ -214,20 +218,21 @@ { HashMap map = null; switch (type) { - case AbstractAttributeState.ATTR_GENERAL: - map = state.getGeneralAttributeMap(); - break; - default: - String s = Bundle.getString("Tags_ParameterRenderError", - new Object[]{new Integer(type)}); - logger.error(s); - throw new IllegalStateException(s); + case AbstractAttributeState.ATTR_GENERAL: + map = state.getGeneralAttributeMap(); + break; + default: + String s = Bundle.getString("Tags_ParameterRenderError", + new Object[]{new Integer(type)}); + logger.error(s); + throw new IllegalStateException(s); } renderGeneral(map, sb, doubleQuote); } - final protected void renderAttributes(int type, AbstractRenderAppender sb, AbstractAttributeState state) { - renderAttributes(type,sb,state,true); + final protected void renderAttributes(int type, AbstractRenderAppender sb, AbstractAttributeState state) + { + renderAttributes(type, sb, state, true); } /** @@ -332,17 +337,17 @@ // pick the map of renderers HashMap h = null; switch (renderingType) { - case HTML_RENDERING: - h = _html; - break; - case HTML_RENDERING_QUIRKS: - h = _htmlQuirks; - break; - case XHTML_RENDERING: - h = _xhtml; - break; - default: - assert(true) : "Didn't find the map for rendering type:" + renderingType; + case HTML_RENDERING: + h = _html; + break; + case HTML_RENDERING_QUIRKS: + h = _htmlQuirks; + break; + case XHTML_RENDERING: + h = _xhtml; + break; + default: + assert(true) : "Didn't find the map for rendering type:" + renderingType; } // return the renderer @@ -387,7 +392,7 @@ if (html != null) { renderingType = html.getTargetDocumentType(); } - return (renderingType == XHTML_RENDERING) ? _xhtmlConstants : _htmlConstants; + return (renderingType == XHTML_RENDERING) ? _xhtmlConstants : _htmlConstants; } } @@ -407,6 +412,6 @@ } // pick the map of renderers - return (renderingType == XHTML_RENDERING) ? "&" : "&"; + return (renderingType == XHTML_RENDERING) ? "&" : "&"; } } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TextAreaTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TextAreaTag.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TextAreaTag.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TextAreaTag.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TextAreaTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TextAreaTag.java Fri Jan 7 19:59:20 2005 @@ -19,7 +19,6 @@ import org.apache.beehive.netui.tags.html.HtmlConstants; -import javax.servlet.jsp.PageContext; import java.util.HashMap; /** Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/ThTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/ThTag.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/ThTag.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/ThTag.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/ThTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/ThTag.java Fri Jan 7 19:59:20 2005 @@ -26,7 +26,7 @@ * Required href */ public abstract class ThTag - extends TagHtmlBase + extends TagHtmlBase { public static void add(HashMap html, HashMap htmlQuirks, HashMap xhtml) { @@ -36,7 +36,7 @@ } public static class State - extends AbstractHtmlState + extends AbstractHtmlState { public void clear() { @@ -45,8 +45,8 @@ } private static class Rendering - extends ThTag - implements HtmlConstants + extends ThTag + implements HtmlConstants { public void doStartTag(AbstractRenderAppender sb, AbstractTagState renderState) { Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/AttributeRenderer.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/AttributeRenderer.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/AttributeRenderer.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/AttributeRenderer.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/AttributeRenderer.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/AttributeRenderer.java Fri Jan 7 19:59:20 2005 @@ -248,22 +248,22 @@ TreeHtmlAttributeInfo a = (TreeHtmlAttributeInfo) removes.removes.get(i); if (a.getAttribute().equals(attr.getAttribute())) { switch (list) { - case TreeHtmlAttributeInfo.HTML_LOCATION_DIV: - if (a.isOnDiv()) - return a; - break; - case TreeHtmlAttributeInfo.HTML_LOCATION_ICON: - if (a.isOnIcon()) - return a; - break; - case TreeHtmlAttributeInfo.HTML_LOCATION_ICON_LINK: - if (a.isOnIconLink()) - return a; - break; - case TreeHtmlAttributeInfo.HTML_LOCATION_LABEL_LINK: - if (a.isOnLabelLink()) - return a; - break; + case TreeHtmlAttributeInfo.HTML_LOCATION_DIV: + if (a.isOnDiv()) + return a; + break; + case TreeHtmlAttributeInfo.HTML_LOCATION_ICON: + if (a.isOnIcon()) + return a; + break; + case TreeHtmlAttributeInfo.HTML_LOCATION_ICON_LINK: + if (a.isOnIconLink()) + return a; + break; + case TreeHtmlAttributeInfo.HTML_LOCATION_LABEL_LINK: + if (a.isOnLabelLink()) + return a; + break; } } } @@ -339,23 +339,23 @@ // based upon the type we are removing, if the matching attribute supports the type // then we add it back. switch (list) { - case TreeHtmlAttributeInfo.HTML_LOCATION_DIV: - if (a.isOnDiv() && !al.contains(a)) - al.add(a); - break; - case TreeHtmlAttributeInfo.HTML_LOCATION_ICON: - if (a.isOnIcon() && !al.contains(a)) - al.add(a); - break; - case TreeHtmlAttributeInfo.HTML_LOCATION_ICON_LINK: - if (a.isOnIconLink() && !al.contains(a)) - al.add(a); - break; - case TreeHtmlAttributeInfo.HTML_LOCATION_LABEL_LINK: - if (a.isOnLabelLink() && !al.contains(a)) { - al.add(a); - } - break; + case TreeHtmlAttributeInfo.HTML_LOCATION_DIV: + if (a.isOnDiv() && !al.contains(a)) + al.add(a); + break; + case TreeHtmlAttributeInfo.HTML_LOCATION_ICON: + if (a.isOnIcon() && !al.contains(a)) + al.add(a); + break; + case TreeHtmlAttributeInfo.HTML_LOCATION_ICON_LINK: + if (a.isOnIconLink() && !al.contains(a)) + al.add(a); + break; + case TreeHtmlAttributeInfo.HTML_LOCATION_LABEL_LINK: + if (a.isOnLabelLink() && !al.contains(a)) { + al.add(a); + } + break; } } } 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=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java&r2=124619 ============================================================================== --- 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 7 19:59:20 2005 @@ -17,6 +17,7 @@ */ package org.apache.beehive.netui.tags.tree; +import org.apache.beehive.netui.core.URLCodec; import org.apache.beehive.netui.core.urls.MutableURI; import org.apache.beehive.netui.pageflow.internal.InternalUtils; import org.apache.beehive.netui.pageflow.internal.ServerAdapterManager; @@ -29,13 +30,12 @@ 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.core.URLCodec; +import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.JspException; import javax.servlet.jsp.PageContext; -import javax.servlet.ServletContext; import java.io.IOException; import java.net.URISyntaxException; import java.util.HashMap; @@ -881,7 +881,7 @@ catch (URISyntaxException e) { // report the error... String s = Bundle.getString("Tags_Tree_Node_URLException", - new Object[]{action, e.getMessage()}); + new Object[]{action, e.getMessage()}); registerTagError(s, e); } @@ -1029,7 +1029,7 @@ catch (URISyntaxException e) { // report the error... String s = Bundle.getString("Tags_Tree_Node_URLException", - new Object[]{action, e.getMessage()}); + new Object[]{action, e.getMessage()}); registerTagError(s, e); } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java?view=diff&rev=124619&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java&r1=124618&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java&r2=124619 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java Fri Jan 7 19:59:20 2005 @@ -22,7 +22,6 @@ import org.apache.beehive.netui.util.Bundle; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.JspException; import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.JspTag; @@ -89,9 +88,9 @@ * @netui.tldx:attribute category="general" reftype="netui-action-url" */ public void setAction(String action) - throws JspException + throws JspException { - _action = setRequiredValueAttribute(action,"action"); + _action = setRequiredValueAttribute(action, "action"); } /** @@ -102,9 +101,9 @@ * @netui.tldx:attribute category="general" */ public void setClientAction(String action) - throws JspException + throws JspException { - _clientAction = setRequiredValueAttribute(action,"clientAction"); + _clientAction = setRequiredValueAttribute(action, "clientAction"); } /** @@ -115,9 +114,9 @@ * @netui.tldx:attribute category="general" */ public void setTagId(String tagId) - throws JspException + throws JspException { - _tagId = setRequiredValueAttribute(tagId,"tagId"); + _tagId = setRequiredValueAttribute(tagId, "tagId"); } /** @@ -163,9 +162,9 @@ * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.URIPropertyClass" */ public void setHref(String href) - throws JspException + throws JspException { - _href = setRequiredValueAttribute(href,"href"); + _href = setRequiredValueAttribute(href, "href"); } /** @@ -333,7 +332,7 @@ if (hasErrors()) { String s = getInlineError(); if (s == null) - s = Bundle.getString("Tags_TreeItemErrorNoInline"); + s = Bundle.getString("Tags_TreeItemErrorNoInline"); else inlineError = true; _treeElement.setContent(s);
