Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/MethodParameter.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/MethodParameter.java?view=diff&r1=161136&r2=161137 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/MethodParameter.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/MethodParameter.java Tue Apr 12 17:09:46 2005 @@ -116,7 +116,7 @@ * bodycontentpref="empty" */ public class MethodParameter - extends AbstractClassicTag { + extends AbstractClassicTag { /** * An identifier denoting that the value of this method parameter @@ -234,7 +234,7 @@ * @throws JspException if an error occurs getting the parameter */ public int doStartTag() - throws JspException { + throws JspException { Tag parent = getParent(); if(parent == null || !(parent instanceof AbstractCallMethod)) { String msg = Bundle.getErrorString("Tags_MethodParameter_invalidParent"); @@ -260,7 +260,7 @@ * @return EVAL_PAGE to continue evaluating the page */ public int doEndTag() - throws JspException { + throws JspException { if(!hasErrors()) { AbstractCallMethod cm = (AbstractCallMethod)getParent(); if(_isNull || _value == null)
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/ObjectNotFoundException.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/ObjectNotFoundException.java?view=diff&r1=161136&r2=161137 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/ObjectNotFoundException.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/ObjectNotFoundException.java Tue Apr 12 17:09:46 2005 @@ -28,7 +28,7 @@ * be found. The [EMAIL PROTECTED] CallMethod#resolveObject()} call throws this exception. */ public class ObjectNotFoundException - extends Exception { + extends Exception { private String _objectName = null; Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/Message.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/Message.java?view=diff&r1=161136&r2=161137 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/Message.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/Message.java Tue Apr 12 17:09:46 2005 @@ -65,7 +65,7 @@ * whitespace="indent" */ public class Message - extends AbstractClassicTag { + extends AbstractClassicTag { public static final String MESSAGE_ARG_KEY = "netui_bundleMessageArguments"; @@ -102,7 +102,7 @@ } public int doEndTag() - throws JspException { + throws JspException { Object[] args = (_argList != null ? _argList.toArray() : null); if(hasErrors()) { @@ -119,7 +119,8 @@ Object exprVal = null; try { exprVal = java.text.MessageFormat.format(_value.toString(), args); - } catch(Exception e) { + } + catch(Exception e) { String msg = "Error formatting message \"" + _value.toString() + "\". Cause: " + e.getLocalizedMessage(); registerTagError(msg, null); } @@ -134,7 +135,8 @@ // if nested in a <netui-data:message ... /> tag, add the result of this tag as an argument. if((msgParent = (Message)SimpleTagSupport.findAncestorWithClass(this, Message.class)) != null) { msgParent.addMessageArgument(exprVal); - } else + } + else pageContext.setAttribute(_resultId, exprVal); localRelease(); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/MessageArg.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/MessageArg.java?view=diff&r1=161136&r2=161137 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/MessageArg.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/MessageArg.java Tue Apr 12 17:09:46 2005 @@ -44,7 +44,7 @@ * whitespace="indent" */ public class MessageArg - extends AbstractClassicTag { + extends AbstractClassicTag { private Object _value = null; @@ -63,7 +63,7 @@ } public int doStartTag() - throws JspException { + throws JspException { // verify parent tag if(!(getParent() instanceof Message)) { throw new JspException("Invalid Parent"); @@ -73,7 +73,7 @@ } public int doEndTag() - throws JspException { + throws JspException { if(hasErrors()) reportErrors(); else Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/pageinput/DeclarePageInput.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/pageinput/DeclarePageInput.java?view=diff&r1=161136&r2=161137 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/pageinput/DeclarePageInput.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/pageinput/DeclarePageInput.java Tue Apr 12 17:09:46 2005 @@ -123,7 +123,7 @@ * expressioninfo="workshop.netui.jspdesigner.tldx.expression.NetuiPageInputExpressionInfo" */ public class DeclarePageInput - extends AbstractSimpleTag { + extends AbstractSimpleTag { private static final Logger logger = Logger.getInstance(DeclarePageInput.class); private static final String EMPTY_STRING = ""; @@ -187,7 +187,7 @@ * */ public void doTag() - throws JspException { + throws JspException { if(logger.isDebugEnabled()) logger.debug("Added a page input named \"" + _name + "\" of type \"" + _type + "\""); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/Repeater.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/Repeater.java?view=diff&r1=161136&r2=161137 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/Repeater.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/Repeater.java Tue Apr 12 17:09:46 2005 @@ -160,8 +160,8 @@ * renderer="workshop.netui.jspdesigner.tldx.RepeaterRenderer" */ public class Repeater - extends DataSourceTag - implements IDataAccessProvider, TryCatchFinally { + extends DataSourceTag + implements IDataAccessProvider, TryCatchFinally { private static final Logger LOGGER = Logger.getInstance(Repeater.class); @@ -297,7 +297,7 @@ */ public Object getCurrentMetadata() { LocalizedUnsupportedOperationException uoe = - new LocalizedUnsupportedOperationException("The " + getTagName() + "does not export metadata for its iterated items."); + new LocalizedUnsupportedOperationException("The " + getTagName() + "does not export metadata for its iterated items."); uoe.setLocalizedMessage(Bundle.getErrorString("Tags_DataAccessProvider_metadataUnsupported", new Object[]{getTagName()})); throw uoe; } @@ -362,7 +362,7 @@ * @throws JspException if an error occurs that can not be reported in the page */ public int doStartTag() - throws JspException { + throws JspException { Object source = null; if(getDataSource() != null) @@ -427,7 +427,8 @@ // the data Iterator was either empty or contained zero non-null items (if _ignoreNulls=true) // skip the body and go straight to doEndTag return SKIP_BODY; - } else + } + else return EVAL_BODY_BUFFERED; } @@ -479,7 +480,7 @@ * @throws JspException if an error occurs that can not be reported in the page */ public int doEndTag() - throws JspException { + throws JspException { if(hasErrors()) reportErrors(); else if(_contentBuffer != null) @@ -495,7 +496,7 @@ } public void doCatch(Throwable t) - throws Throwable { + throws Throwable { throw t; } @@ -530,8 +531,8 @@ private int renderStructured() { if(LOGGER.isDebugEnabled() && _padContext != null) LOGGER.debug("\ncurrentIndex: " + _currentIndex + "\n" + - "checkMaxRepeat: " + _padContext.checkMaxRepeat(_currentIndex) + "\n" + - "checkMinRepeat: " + _padContext.checkMinRepeat(_currentIndex) + "\n"); + "checkMaxRepeat: " + _padContext.checkMaxRepeat(_currentIndex) + "\n" + + "checkMinRepeat: " + _padContext.checkMinRepeat(_currentIndex) + "\n"); if(_renderState == INIT) { _renderState = HEADER; @@ -575,8 +576,8 @@ if(LOGGER.isDebugEnabled() && _padContext != null) LOGGER.debug("\ncurrentIndex: " + _currentIndex + "\n" + - "checkMaxRepeat: " + _padContext.checkMaxRepeat(_currentIndex) + "\n" + - "checkMinRepeat: " + _padContext.checkMinRepeat(_currentIndex) + "\n"); + "checkMaxRepeat: " + _padContext.checkMaxRepeat(_currentIndex) + "\n" + + "checkMinRepeat: " + _padContext.checkMinRepeat(_currentIndex) + "\n"); // check that the maximum number of items to render has _not_ been reached if(_iterator.hasNext() && (_padContext == null || (_padContext != null && !_padContext.checkMaxRepeat(_renderedItems)))) { Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterComponent.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterComponent.java?view=diff&r1=161136&r2=161137 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterComponent.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterComponent.java Tue Apr 12 17:09:46 2005 @@ -35,7 +35,7 @@ * only be nested within the [EMAIL PROTECTED] Repeater} tag. */ public abstract class RepeaterComponent - extends AbstractClassicTag { + extends AbstractClassicTag { private static final Logger LOGGER = Logger.getInstance(RepeaterComponent.class); @@ -62,14 +62,14 @@ * class. If an error occurs, the tag returns SKIP_BODY. */ public int doStartTag() - throws JspException { + throws JspException { int ret = SKIP_BODY; try { Tag parent = getParent(); Class validContainer = Repeater.class; if((validContainer != null && parent == null) || - validContainer != null && !validContainer.isAssignableFrom(parent.getClass())) { + validContainer != null && !validContainer.isAssignableFrom(parent.getClass())) { if(LOGGER.isErrorEnabled()) { LOGGER.error("A tag of type \"" + getClass().getName() + "\" must be nested within a tag of type \"" + Repeater.class.getName() + "\""); } @@ -103,8 +103,10 @@ if(shouldRender()) ret = EVAL_BODY_BUFFERED; - else ret = SKIP_BODY; - } catch(Exception e) { + else + ret = SKIP_BODY; + } + catch(Exception e) { String msg = Bundle.getString("Tags_RepeaterComponent_startTagError", new Object[]{getTagName(), e}); if(LOGGER.isErrorEnabled()) @@ -124,7 +126,7 @@ * @return SKIP_BODY */ public int doAfterBody() - throws JspException { + throws JspException { assert _repeater != null; _repeater.addContent(bodyContent.getString()); return SKIP_BODY; @@ -139,7 +141,7 @@ * @throws JspException if an error that occurred that could not be reported to the page */ public int doEndTag() - throws JspException { + throws JspException { /* note, this does not report errors because the <repeater> tag itself does the error reporting @@ -154,7 +156,8 @@ try { int state = _repeater.getRenderState(); ret = renderEndTag(state); - } catch(Exception e) { + } + catch(Exception e) { String msg = Bundle.getString("Tags_RepeaterComponent_endTagError", new Object[]{getTagName(), e.toString()}); registerTagError(msg, e); reportErrors(); @@ -185,11 +188,11 @@ protected abstract boolean shouldRender(); protected void verifyAttributes() - throws JspException - {} + throws JspException { + } protected int renderEndTag(int state) - throws JspException { - return EVAL_PAGE; + throws JspException { + return EVAL_PAGE; } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterFooter.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterFooter.java?view=diff&r1=161136&r2=161137 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterFooter.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterFooter.java Tue Apr 12 17:09:46 2005 @@ -70,7 +70,7 @@ * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.RepeaterFooterRenderer" whitespace="indent" requiredparent="repeater" */ public class RepeaterFooter - extends RepeaterComponent { + extends RepeaterComponent { /** * Get the name of this tag. This is used to identify the type of this tag Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterHeader.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterHeader.java?view=diff&r1=161136&r2=161137 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterHeader.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterHeader.java Tue Apr 12 17:09:46 2005 @@ -70,7 +70,7 @@ * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.RepeaterHeaderRenderer" whitespace="indent" requiredparent="repeater" */ public class RepeaterHeader - extends RepeaterComponent { + extends RepeaterComponent { /** * Get the name of this tag. This is used to identify the type of this tag Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterItem.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterItem.java?view=diff&r1=161136&r2=161137 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterItem.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterItem.java Tue Apr 12 17:09:46 2005 @@ -64,7 +64,7 @@ * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.RepeaterItemRenderer" whitespace="indent" requiredparent="repeater" */ public class RepeaterItem - extends RepeaterComponent { + extends RepeaterComponent { /** * Get the name of this tag. This is used to identify the type of this tag Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/Pad.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/Pad.java?view=diff&r1=161136&r2=161137 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/Pad.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/Pad.java Tue Apr 12 17:09:46 2005 @@ -71,7 +71,7 @@ * @netui.tldx:tag requiredparent="repeater" output="|$children|" whitespace="indent" */ public class Pad - extends RepeaterComponent { + extends RepeaterComponent { private static final Logger LOGGER = Logger.getInstance(Pad.class); @@ -145,11 +145,12 @@ protected boolean shouldRender() { if(_padText == null) return true; - else return false; + else + return false; } - + public int doAfterBody() - throws JspException { + throws JspException { return SKIP_BODY; } @@ -162,7 +163,7 @@ * @throws JspException if an error occurs that can not be reported on the page */ protected int renderEndTag(int state) - throws JspException { + throws JspException { if(_padText == null) { _padText = bodyContent.getString(); @@ -175,8 +176,8 @@ } PadContext pc = new PadContext(_padText, - (_minRepeat != null ? _minRepeat.intValue() : PadContext.DEFAULT_VALUE), - (_maxRepeat != null ? _maxRepeat.intValue() : PadContext.DEFAULT_VALUE)); + (_minRepeat != null ? _minRepeat.intValue() : PadContext.DEFAULT_VALUE), + (_maxRepeat != null ? _maxRepeat.intValue() : PadContext.DEFAULT_VALUE)); getRepeater().setPadContext(pc); @@ -206,7 +207,7 @@ * @throws JspException if an error occurs that can not be reported on the page */ protected void verifyAttributes() - throws JspException { + throws JspException { if(_maxRepeat != null && _maxRepeat.intValue() <= 0) { String msg = Bundle.getErrorString("Tags_Pad_intTooSmall", new Object[]{_maxRepeat, "maxRepeat"}); getRepeater().registerTagError(msg, null); @@ -219,11 +220,11 @@ // check composite properties if(_maxRepeat != null && - _minRepeat != null && - _minRepeat.intValue() > _maxRepeat.intValue()) { + _minRepeat != null && + _minRepeat.intValue() > _maxRepeat.intValue()) { if(LOGGER.isWarnEnabled()) { String msg = "The value of maxRepeat (" + _maxRepeat + ") must be greater than the value of minRepeat (" + - _minRepeat + ") on the Repeater Pad tag."; + _minRepeat + ") on the Repeater Pad tag."; LOGGER.warn(msg); } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/script/GetData.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/script/GetData.java?view=diff&r1=161136&r2=161137 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/script/GetData.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/script/GetData.java Tue Apr 12 17:09:46 2005 @@ -83,7 +83,7 @@ * bodycontentpref="empty" */ public class GetData - extends AbstractClassicTag { + extends AbstractClassicTag { private static final Logger LOGGER = Logger.getInstance(GetData.class); @@ -150,17 +150,18 @@ * @return EVAL_PAGE */ public int doEndTag() - throws JspException { + throws JspException { if(_value != null) { if(LOGGER.isInfoEnabled() && pageContext.getAttribute(_resultId) != null) LOGGER.info("Overwriting a value in PageContext attribute map with key \"" + _resultId + - "\" and object of type \"" + _value.getClass().getName()); + "\" and object of type \"" + _value.getClass().getName()); pageContext.setAttribute(_resultId, _value); - } else { + } + else { if(LOGGER.isInfoEnabled()) LOGGER.info("Removing a value from the PageContext attribute map with key \"" + _resultId + - "\". The object returned by the expression is null."); + "\". The object returned by the expression is null."); pageContext.removeAttribute(_resultId); } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/xml/SerializeXML.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/xml/SerializeXML.java?view=diff&r1=161136&r2=161137 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/xml/SerializeXML.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/xml/SerializeXML.java Tue Apr 12 17:09:46 2005 @@ -33,7 +33,7 @@ * @netui.tldx:tag whitespace="indent" */ public class SerializeXML - extends AbstractClassicTag { + extends AbstractClassicTag { private static final Logger LOGGER = Logger.getInstance(SerializeXML.class); @@ -63,7 +63,7 @@ } public int doEndTag() - throws JspException { + throws JspException { assert _source != null; if(_source instanceof XmlObject && _source != null) { @@ -79,7 +79,8 @@ buf.append("\n-->\n</div>"); write(buf.toString()); - } else { + } + else { // @todo: write anything to the page? if(LOGGER.isInfoEnabled()) LOGGER.info("The expression \"" + _source + "\" resulted in an object that was not an XMLBean"); Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/netui.properties URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/netui.properties?view=diff&r1=161136&r2=161137 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/netui.properties (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/netui.properties Tue Apr 12 17:09:46 2005 @@ -671,6 +671,7 @@ HeaderCell_CantEnableFiltering=Can not enable filtering on a column with a null filter expression DataGridFilter_NoFilterOperation=Can not determine the operation for a filter with filter expression \"{0}\" DataGridFilter_UnknownFilterOperation=Can not include the filter with operation \"{0}\" in a SQL statement; the operation is unknown +FilterTypeHint_UnknownHintString=The filter type hint \"{0}\" is not recognized as a valid type hint # # Utility Strings
