Author: ekoneil Date: Wed Jan 19 11:00:31 2005 New Revision: 125643 URL: http://svn.apache.org/viewcvs?view=rev&rev=125643 Log: Apply a consistent code formatting to a bunch of NetUI code.
BB: self DRT: NetUI pass Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/Expression.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEngineFactory.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluationException.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluator.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionUpdateException.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/IllegalExpressionException.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/RuntimeExpressionException.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/AbstractScriptableMap.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleContext.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleMap.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ContextFactory.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderBean.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderStack.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/IDataAccessProvider.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ScriptablePageInput.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionEvaluatorImpl.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionParseException.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionTerm.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/LiteralTerm.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIReadVariableResolver.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIUpdateVariableResolver.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIVariableResolver.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/Term.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParser.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParserConstants.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParserTokenManager.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/ParseException.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/SimpleCharStream.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/Token.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/TokenMgrError.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ArrayIndexToken.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ContextToken.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/IdentifierToken.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/MapKeyToken.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/AbstractAttributeMap.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/BindingContext.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/RequestAttributeMap.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/SessionAttributeMap.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/FilterModel.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/IFilter.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/DefaultSort.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/ISort.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/SortModel.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/DefaultStylePolicy.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/EmptyStylePolicy.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/StylePolicy.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/AnchorCellDecorator.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/HeaderCellDecorator.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SortedCellDecorator.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/AbstractPagerRenderer.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/FirstPreviousNextLastPagerRenderer.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/IPagerRenderer.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PreviousNextPagerRenderer.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/table/TableRenderer.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/FilterService.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/IllegalFilterException.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/pager/PagerService.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortFactory.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortService.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/JspUtil.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/ParameterUtil.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/StructuredBaseTag.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/style/AbstractStyleBean.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/bundle/DeclareBundle.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/style/CellRepeaterStyleBean.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Columns.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGridUtil.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/RenderPager.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/AbstractCallMethod.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallMethod.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallPageFlow.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/MethodParameter.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/ObjectNotFoundException.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/Message.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/MessageArg.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/pageinput/DeclarePageInput.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/Repeater.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterComponent.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterFooter.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterHeader.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterItem.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/Pad.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/PadContext.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/script/GetData.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/xml/SerializeXML.java incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/HtmlExceptionFormatter.java incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/ClassLevelCache.java incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/MethodCache.java incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/PropertyCache.java incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigInitializationException.java incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigUtil.java incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedIllegalArgumentException.java incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedIllegalStateException.java incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedUnsupportedOperationException.java incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ArrayIterator.java incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/AtomicObjectIterator.java incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/EmptyIterator.java incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/EnumerationIterator.java incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactoryException.java incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/MapIterator.java incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ResultSetIterator.java incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/BaseTypeConverter.java incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/DelegatingTypeConverter.java incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConversionException.java incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverter.java incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverterNotFoundException.java incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeUtils.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/BarJavaBean.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/ComplexTypeActionForm.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/FooJavaBean.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/IProduct.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/Product.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/SimpleTypeActionForm.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/databinding/expression/IndexedNameTest.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortServiceTest.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AbstractExpressionTest.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/BundleScriptTest.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTestError.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/PageInputTest.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ProcessPopulateTest.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELAccessTest.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELBundleScriptTest.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELCustomBindingContextTest.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionObjectTest.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionTest.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionUpdateTest.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELPageInputTest.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELParsedExpressionTest.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/simpleaction/InternalExpressionUtilsTest.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/FauxPageContext.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/HttpServletRequestHandler.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/HttpServletResponseHandler.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletFactory.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletHandler.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/tools/AssertHelper.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/TestConfigUtil.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/IteratorFactoryTest.java incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/type/TypeUtilsTest.java Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/Expression.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/Expression.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/Expression.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/Expression.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/Expression.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/Expression.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.script; // java imports + import java.util.List; // internal imports @@ -30,8 +31,8 @@ * including the data binding context and tokens that constitute * the expression. */ -public abstract class Expression -{ +public abstract class Expression { + /** * Get the expression's data binding context. */ @@ -43,13 +44,13 @@ * "customer", and "name". */ public abstract List getTokens(); - + /** * Return an expression that is created starting with the * token at the given index. * * @throws [EMAIL PROTECTED] java.lang.IllegalStateException} if the provided start token is out of bounds - * given the number of tokens in the expression + * given the number of tokens in the expression */ public abstract String getExpression(int start); } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEngineFactory.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEngineFactory.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEngineFactory.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEngineFactory.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEngineFactory.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEngineFactory.java Wed Jan 19 11:00:31 2005 @@ -26,8 +26,8 @@ /** * */ -public abstract class ExpressionEngineFactory -{ +public abstract class ExpressionEngineFactory { + public abstract ExpressionEvaluator getInstance(); } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluationException.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluationException.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluationException.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluationException.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluationException.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluationException.java Wed Jan 19 11:00:31 2005 @@ -24,12 +24,12 @@ // external imports /** - * The most general exception thrown when an error occurs in evaluating + * The most general exception thrown when an error occurs in evaluating * an expression. */ public class ExpressionEvaluationException - extends Exception -{ + extends Exception { + private String expression = null; private String[] contexts = null; private String localizedMessage = null; @@ -37,20 +37,18 @@ /** * Construct an ExpressionEvaluationException. */ - public ExpressionEvaluationException() - { + public ExpressionEvaluationException() { super(); } /** - * Construct an ExpressionEvaluationException with the given message and + * Construct an ExpressionEvaluationException with the given message and * the failed expression. * - * @param message a String containing the text of the exception message + * @param message a String containing the text of the exception message * @param expression the expression whose evaluation failed */ - public ExpressionEvaluationException(String message, String expression) - { + public ExpressionEvaluationException(String message, String expression) { super(message); this.expression = expression; } @@ -59,12 +57,11 @@ * Construct an ExpressionEvaluationException with the given message, * the failed expression, and cause. * - * @param message a String containing the text of the exception message + * @param message a String containing the text of the exception message * @param expression the expression whose evaluation failed - * @param cause a <code>Throwable</code> that is wrapped by this exception + * @param cause a <code>Throwable</code> that is wrapped by this exception */ - public ExpressionEvaluationException(String message, String expression, Throwable cause) - { + public ExpressionEvaluationException(String message, String expression, Throwable cause) { super(message, cause); this.expression = expression; } @@ -73,10 +70,9 @@ * Construct a ExpressionEvaluationException with the given <code>message</code> and <code>cause</code>. * * @param expression a String containing the text of the exception message - * @param cause a <code>Throwable</code> that is wrapped by this exception + * @param cause a <code>Throwable</code> that is wrapped by this exception */ - public ExpressionEvaluationException(String expression, Throwable cause) - { + public ExpressionEvaluationException(String expression, Throwable cause) { super(cause); this.expression = expression; } @@ -86,8 +82,7 @@ * * @return the expression that caused the problem */ - public String getExpression() - { + public String getExpression() { return expression; } @@ -97,30 +92,26 @@ * * @param contexts the list of available contexts. */ - public void setAvailableContexts(String[] contexts) - { + public void setAvailableContexts(String[] contexts) { this.contexts = contexts; } - + /** - * Get the top-level contexts that were available at the time that the + * Get the top-level contexts that were available at the time that the * expression failed. * * @return the contexts that were available at the time the expression was evaluated or <code>null</code> - * if the contexts were not set. + * if the contexts were not set. */ - public String[] getAvailableContexts() - { + public String[] getAvailableContexts() { return contexts; } - public void setLocalizedMessage(String localizedMessage) - { + public void setLocalizedMessage(String localizedMessage) { this.localizedMessage = localizedMessage; } - public String getLocalizedMessage() - { + public String getLocalizedMessage() { return localizedMessage; } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluator.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluator.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluator.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluator.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluator.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluator.java Wed Jan 19 11:00:31 2005 @@ -22,17 +22,16 @@ /** * An interface for evaluating expressions in NetUI. Different languages may implement * this to expose the language for use in the NetUI JSP tags. - * */ -public interface ExpressionEvaluator -{ +public interface ExpressionEvaluator { + /** * Evaluate an expression and return the result. - * - * @param expression the expression to evaluate + * + * @param expression the expression to evaluate * @param variableResolver the set of contexts that may be used in expression evaluation. This set - * is not necessarily complete as some objects that can be used as top-level expression contexts - * may be contained within an object available in this JavaBean. + * is not necessarily complete as some objects that can be used as top-level expression contexts + * may be contained within an object available in this JavaBean. * @throws ExpressionEvaluationException when an error occurs */ public Object evaluateStrict(String expression, VariableResolver variableResolver) @@ -41,16 +40,16 @@ /** * Update an expression with the given value. This will apply the parameter <code>value</code> * to the object referenced by the expression <code>expression</code>. The <code>requestParameter</code> - * flag is used by a caller to restrict the set of contexts into which an update can occur on - * the request. + * flag is used by a caller to restrict the set of contexts into which an update can occur on + * the request. * - * @param expression the expression whose value to update - * @param value the new value for the update + * @param expression the expression whose value to update + * @param value the new value for the update * @param variableResolver the set of contexts that may be used in expression evaluation. This set - * is not necessarily complete as some objects that can be used as top-level expression contexts - * may be contained within an object available in this JavaBean. - * @param requestParameter a boolean that marks this update as occurring from data in the request, if - * <code>true</code> or simply as a regular update. + * is not necessarily complete as some objects that can be used as top-level expression contexts + * may be contained within an object available in this JavaBean. + * @param requestParameter a boolean that marks this update as occurring from data in the request, if + * <code>true</code> or simply as a regular update. */ public void update(String expression, Object value, VariableResolver variableResolver, boolean requestParameter) throws ExpressionUpdateException; @@ -60,28 +59,28 @@ * that need to be qualified into a different context for evaluation. The context * of an expression is its first identifier, up to the first delimiter. * - * @param expression the expression whose context to change - * @param oldContext the old context to replace, if present - * @param newContext the new context to replace if the expression starts with the <code>oldContext</code> + * @param expression the expression whose context to change + * @param oldContext the old context to replace, if present + * @param newContext the new context to replace if the expression starts with the <code>oldContext</code> * @param lookupIndex an index used to qualify an expression into an array look-up. * @exclude */ - public String changeContext(String expression, String oldContext, String newContext, int lookupIndex) + public String changeContext(String expression, String oldContext, String newContext, int lookupIndex) throws ExpressionEvaluationException; /** * Qualify the expression into the given context. This will take the <code>expression</code> - * and simply qualify it into the new context <code>contextName</code>. + * and simply qualify it into the new context <code>contextName</code>. * * @param contextName the new context - * @param expression the expression to qualify + * @param expression the expression to qualify * @exclude */ - public String qualify(String contextName, String expression) + public String qualify(String contextName, String expression) throws ExpressionEvaluationException; /** - * Checks to see if a particular String is exactly an expression. + * Checks to see if a particular String is exactly an expression. * * @param expression the expression to check * @return <code>true</code> if the expression is exactly an expression; <code>false</code> otherwise. @@ -91,9 +90,9 @@ /** * Checks to see if a particular expression contains an expression. This method will return - * <code>true</code> if there is an expression surrounded by whitespace, other expressions, + * <code>true</code> if there is an expression surrounded by whitespace, other expressions, * or literal text. - * + * * @param expression the expression to check * @return <code>true</code> if the expression contains an expression; <code>false</code> otherwise. */ Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java Wed Jan 19 11:00:31 2005 @@ -29,24 +29,20 @@ /** * Get an expression evaluator. */ -public class ExpressionEvaluatorFactory -{ +public class ExpressionEvaluatorFactory { + private static final Logger _logger = Logger.getInstance(ExpressionEvaluatorFactory.class); private static final HashMap FACTORY_MAP = new HashMap(); private static ExpressionEngineFactory DEFAULT_FACTORY; - static - { - try - { + static { + try { DEFAULT_FACTORY = initialize(FACTORY_MAP); - } - catch(Exception e) - { + } catch(Exception e) { DEFAULT_FACTORY = null; - if(_logger.isErrorEnabled()) + if(_logger.isErrorEnabled()) _logger.error("An exception occurred loading the expression evaluator configuration. Cause: " + e, e); } } @@ -54,10 +50,9 @@ /** * Get the default instance of an expression evaluator. * - * @return an [EMAIL PROTECTED] ExpressionEvaluator} + * @return an [EMAIL PROTECTED] ExpressionEvaluator} */ - public final static ExpressionEvaluator getInstance() - { + public final static ExpressionEvaluator getInstance() { return getInstance(null); } @@ -67,8 +62,7 @@ * @return an ExpressionEvaluator matching the given name. * @throws IllegalArgumentException if an ExpressionEvaluator matching the name is not found */ - public final static ExpressionEvaluator getInstance(String name) - { + public final static ExpressionEvaluator getInstance(String name) { assert DEFAULT_FACTORY != null; assert FACTORY_MAP != null; @@ -83,84 +77,72 @@ throw new IllegalArgumentException(msg); } - - private static final ExpressionEngineFactory initialize(Map factoryMap) - { + + private static final ExpressionEngineFactory initialize(Map factoryMap) { assert factoryMap != null; NetuiConfig config = ConfigUtil.getConfig(); assert config != null; - ExpressionLanguages languages = config.getExpressionLanguages(); + ExpressionLanguages languages = config.getExpressionLanguages(); assert languages != null; ExpressionLanguage[] array = languages.getExpressionLanguageArray(); assert array != null; - - for(int i = 0; i < array.length; i++) - { + + for(int i = 0; i < array.length; i++) { String name = array[i].getName(); String className = array[i].getFactoryClass(); ExpressionEngineFactory factory = null; - try - { + try { Class type = Class.forName(className); factory = (ExpressionEngineFactory)type.newInstance(); - } - catch(ClassNotFoundException cnf) - { + } catch(ClassNotFoundException cnf) { if(_logger.isWarnEnabled()) _logger.warn("Could not create an ExpressionEngineFactory for type \"" + className + "\" because the implementation class could not be found."); continue; - } - catch(Exception ex) - { + } catch(Exception ex) { assert ex instanceof IllegalAccessException || ex instanceof InstantiationException; - if(_logger.isWarnEnabled()) - _logger.warn("Could not create an ExpressionEngineFactory for type \"" + className + - "\" because an error occurred creating the factory. Cause: " + ex, ex); + if(_logger.isWarnEnabled()) + _logger.warn("Could not create an ExpressionEngineFactory for type \"" + className + + "\" because an error occurred creating the factory. Cause: " + ex, ex); continue; } - + if(factoryMap.containsKey(name)) if(_logger.isWarnEnabled()) _logger.warn("Overwriting a previously defined ExpressionEngineFactory named \"" + name + - "\" with a new ExpressionEngineFactory of type \"" + className + "\""); - else _logger.info("Adding an ExpressionEngineFactory named \"" + name + "\" with implementation \"" + className + "\""); - + "\" with a new ExpressionEngineFactory of type \"" + className + "\""); + else + _logger.info("Adding an ExpressionEngineFactory named \"" + name + "\" with implementation \"" + className + "\""); + factoryMap.put(name, factory); } ExpressionEngineFactory defaultEngineFactory = null; String defaultLanguage = languages.getDefaultLanguage(); - if(defaultLanguage != null) - { + if(defaultLanguage != null) { defaultEngineFactory = (ExpressionEngineFactory)factoryMap.get(defaultLanguage); - if(defaultEngineFactory != null) - { - if(_logger.isInfoEnabled()) + if(defaultEngineFactory != null) { + if(_logger.isInfoEnabled()) _logger.info("Using a default expression evaluator of type \"" + factoryMap.get(defaultLanguage).getClass().getName() + "\""); - } - else - { - String msg = + } else { + String msg = "The default ExpressionEvaluator named \"" + defaultLanguage + "\" was specified, but the ExpressionEngineFactory could not be found."; if(_logger.isWarnEnabled()) _logger.warn(msg); throw new RuntimeException(msg); } - } - else - { + } else { String msg = "There is no default expression engine specified."; if(_logger.isErrorEnabled()) _logger.error(msg); throw new RuntimeException(msg); } - + return defaultEngineFactory; } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionUpdateException.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionUpdateException.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionUpdateException.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionUpdateException.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionUpdateException.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionUpdateException.java Wed Jan 19 11:00:31 2005 @@ -27,13 +27,12 @@ * An exception thrown when an error occurs during an expression update. */ public class ExpressionUpdateException - extends ExpressionEvaluationException -{ + extends ExpressionEvaluationException { + /** * Construct an ExpressionUpdateException. - */ - public ExpressionUpdateException() - { + */ + public ExpressionUpdateException() { super(); } @@ -41,13 +40,11 @@ * Construct an ExpressionUpdateException with the given message, failed expression, expected updated value, * and expression that was used to perform the update. * - * @param message a String containing the text of the exception message + * @param message a String containing the text of the exception message * @param expression the expression whose update failed - * @param cause the <code>Throwable</code> that is wrapped as the cause of this exception - * + * @param cause the <code>Throwable</code> that is wrapped as the cause of this exception */ - public ExpressionUpdateException(String message, String expression, Throwable cause) - { + public ExpressionUpdateException(String message, String expression, Throwable cause) { super(message, expression, cause); } @@ -55,12 +52,10 @@ * Construct an ExpressionUpdateException with the given message, failed expression, expected updated value, * and expression that was used to perform the update. * - * @param message a String containing the text of the exception message + * @param message a String containing the text of the exception message * @param expression the expression whose update failed - * */ - public ExpressionUpdateException(String message, String expression) - { + public ExpressionUpdateException(String message, String expression) { super(message, expression); } @@ -70,11 +65,10 @@ * and will always return null because of the security risk associated * with making the value available. * - * @deprecated * @return the failed update value + * @deprecated */ - public Object getUpdateValue() - { + public Object getUpdateValue() { return null; } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/IllegalExpressionException.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/IllegalExpressionException.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/IllegalExpressionException.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/IllegalExpressionException.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/IllegalExpressionException.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/IllegalExpressionException.java Wed Jan 19 11:00:31 2005 @@ -27,15 +27,14 @@ * An exception thrown when an expression is written in an illegal syntax. */ public class IllegalExpressionException - extends RuntimeExpressionException -{ + extends RuntimeExpressionException { + private String expression = null; /** * Construct an IllegalExpressionException. */ - public IllegalExpressionException() - { + public IllegalExpressionException() { super(); } @@ -44,8 +43,7 @@ * * @param message a String containing the text of the exception message */ - public IllegalExpressionException(String message) - { + public IllegalExpressionException(String message) { super(message); } @@ -54,8 +52,7 @@ * * @param cause a <code>Throwable<code> that caused this exception to be thrown */ - public IllegalExpressionException(Throwable cause) - { + public IllegalExpressionException(Throwable cause) { super(cause); } @@ -63,45 +60,41 @@ * Construct an IllegalExpressionException with the given <code>message</code> and <code>cause</code>. * * @param message a String containing the text of the exception message - * @param cause a <code>Throwable</code> that caused this exception to be thrown + * @param cause a <code>Throwable</code> that caused this exception to be thrown */ - public IllegalExpressionException(String message, Throwable cause) - { + public IllegalExpressionException(String message, Throwable cause) { super(message, cause); } /** * Construct an IllegalExpressionException with the given <code>message</code> and the malformed expression. - * - * @param message a String containing the text of this exception message + * + * @param message a String containing the text of this exception message * @param expression the expression that was malformed and caused this exception to be thrown */ - public IllegalExpressionException(String message, String expression) - { + public IllegalExpressionException(String message, String expression) { this(message); this.expression = expression; } /** * Construct an IllegalExpressionException with the given <code>message</code>, the malformed expression, and the <code>cause</code>. - * - * @param message a String containing the text of this exception message + * + * @param message a String containing the text of this exception message * @param expression the expression that was malformed and caused this exception to be thrown - * @param cause a <code>Throwable</code> that caused this exception to be thrown + * @param cause a <code>Throwable</code> that caused this exception to be thrown */ - public IllegalExpressionException(String message, String expression, Throwable cause) - { + public IllegalExpressionException(String message, String expression, Throwable cause) { this(message, cause); this.expression = expression; } - + /** * Get the malformed expression. * * @return the malformed expression */ - public String getExpression() - { + public String getExpression() { return expression; } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/RuntimeExpressionException.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/RuntimeExpressionException.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/RuntimeExpressionException.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/RuntimeExpressionException.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/RuntimeExpressionException.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/RuntimeExpressionException.java Wed Jan 19 11:00:31 2005 @@ -27,37 +27,31 @@ * */ public abstract class RuntimeExpressionException - extends RuntimeException -{ + extends RuntimeException { + private String localizedMessage = null; - public RuntimeExpressionException() - { + public RuntimeExpressionException() { super(); } - public RuntimeExpressionException(String message) - { + public RuntimeExpressionException(String message) { super(message); } - public RuntimeExpressionException(String message, Throwable cause) - { + public RuntimeExpressionException(String message, Throwable cause) { super(message, cause); } - public RuntimeExpressionException(Throwable cause) - { + public RuntimeExpressionException(Throwable cause) { super(cause); } - public void setLocalizedMessage(String localizedMessage) - { + public void setLocalizedMessage(String localizedMessage) { this.localizedMessage = localizedMessage; } - public String getLocalizedMessage() - { + public String getLocalizedMessage() { return (localizedMessage != null ? localizedMessage : getMessage()); } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/AbstractScriptableMap.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/AbstractScriptableMap.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/AbstractScriptableMap.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/AbstractScriptableMap.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/AbstractScriptableMap.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/AbstractScriptableMap.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.script.common; // java imports + import org.apache.beehive.netui.util.iterator.IteratorFactory; import java.util.AbstractMap; @@ -36,9 +37,10 @@ * language through a Map. This Map implementation is read-only. */ public abstract class AbstractScriptableMap - extends AbstractMap -{ - public AbstractScriptableMap() {} + extends AbstractMap { + + public AbstractScriptableMap() { + } /** * Default implementation of a [EMAIL PROTECTED] java.util.Set} that can be returned by the @@ -46,21 +48,19 @@ * array of entries and implements iterator() and size(). */ class EntrySet - extends AbstractSet - { + extends AbstractSet { + private Entry[] _entries = null; - public EntrySet(Entry[] entries) - { + public EntrySet(Entry[] entries) { _entries = entries; } - public Iterator iterator() - { + + public Iterator iterator() { return IteratorFactory.createIterator(_entries); } - public int size() - { + public int size() { return (_entries != null ? _entries.length : 0); } @@ -96,32 +96,33 @@ * [EMAIL PROTECTED] java.util.AbstractMap} contract. */ class Entry - implements Map.Entry - { + implements Map.Entry { + private final Object _key; private final Object _value; - Entry(Object key, Object value) - { + Entry(Object key, Object value) { _key = key; _value = value; } - public Object getKey() {return _key;} - public Object getValue() {return _value;} + public Object getKey() { + return _key; + } + + public Object getValue() { + return _value; + } - public Object setValue(Object value) - { + public Object setValue(Object value) { throw new UnsupportedOperationException(); } - public int hashCode() - { + public int hashCode() { return ((_key == null ? 0 : _key.hashCode()) ^ (_value == null ? 0 : _value.hashCode())); } - public boolean equals(Object obj) - { + public boolean equals(Object obj) { if(obj == null || !(obj instanceof Map.Entry)) return false; @@ -129,7 +130,7 @@ Object key = entry.getKey(); Object value = entry.getValue(); if((key == null || (key != null && key.equals(_key))) && - (value == null || (value != null && value.equals(_value)))) + (value == null || (value != null && value.equals(_value)))) return true; return false; Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleContext.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleContext.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleContext.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleContext.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleContext.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleContext.java Wed Jan 19 11:00:31 2005 @@ -30,17 +30,17 @@ import org.apache.struts.util.MessageResources; /** - * An object that acts as a storage location for ResourceBundles that are + * An object that acts as a storage location for ResourceBundles that are * declared inside of a JSP. This object is cached in the PageContext - * and is re-created on every page that declares a bundle with the + * and is re-created on every page that declares a bundle with the * [EMAIL PROTECTED] org.apache.beehive.netui.tags.databinding.bundle.DeclareBundle} tag. * * @exclude */ -public class BundleContext -{ +public class BundleContext { + /** - * The attribute name under which a BundleContext object will be stored in a + * The attribute name under which a BundleContext object will be stored in a * PageContext attribute map during the rendering of the page. */ public static final String KEY = "_netui_pageContext_bundleContext"; @@ -53,96 +53,84 @@ private Map bundles = null; - public BundleContext() - { + public BundleContext() { super(); } /** - * Add a bundle to the bundle set. Both the name and properties - * are assumed to be non-null; the Bundle tag should check + * Add a bundle to the bundle set. Both the name and properties + * are assumed to be non-null; the Bundle tag should check * these before adding them to the BundleContext. * - * @param name the name of the bundle + * @param name the name of the bundle * @param bundleName the path to the [EMAIL PROTECTED] ResourceBundle} file that contains the messages */ - public void addBundle(String name, String bundleName) - { + public void addBundle(String name, String bundleName) { addBundle(name, bundleName, null); } - - public void addBundle(String name, String bundleName, Locale localeOverride) - { + + public void addBundle(String name, String bundleName, Locale localeOverride) { if(bundles == null) bundles = new HashMap(); if(bundles.containsKey(name)) - if(_logger.isInfoEnabled()) + if(_logger.isInfoEnabled()) _logger.info("The bundle map already contains a key \"" + name + "\" overwriting the previous value."); BundleNode node = new NetUIBundleNode(bundleName, (localeOverride != null ? localeOverride : DEFAULT_LOCALE)); bundles.put(name, node); } - - public Iterator getBundleNames() - { + + public Iterator getBundleNames() { if(bundles == null) return org.apache.beehive.netui.util.iterator.IteratorFactory.EMPTY_ITERATOR; - else return bundles.keySet().iterator(); + else + return bundles.keySet().iterator(); } - public boolean containsBundle(String name) - { + public boolean containsBundle(String name) { if(bundles == null) return false; - else return bundles.containsKey(name); + else + return bundles.containsKey(name); } /** - * * @throws MissingResourceException if an error occurs while loading a properties file */ - public BundleNode getBundle(String name) - { + public BundleNode getBundle(String name) { if(bundles == null) return null; - + BundleNode bn = (BundleNode)bundles.get(name); if(bn == null) return null; bn.init(); - + return bn; } - - public String toString() - { + + public String toString() { StringBuilder buf = new StringBuilder(256); Iterator iterator = getBundleNames(); - if(iterator.hasNext()) - { - while(iterator.hasNext()) - { + if(iterator.hasNext()) { + while(iterator.hasNext()) { Object key = iterator.next(); buf.append("bundle name: " + key + " bundle path: " + ((BundleNode)bundles.get(key)).bundleName + "\n"); } - } - else - { + } else { buf.append("No registered bundles.\n"); } return buf.toString(); } - public static BundleNode createBundleNode(String name, Object messageResource, Locale locale) - { - if(messageResource instanceof MessageResources) - { + public static BundleNode createBundleNode(String name, Object messageResource, Locale locale) { + if(messageResource instanceof MessageResources) { return new StrutsBundleNode(name, locale, (MessageResources)messageResource); } @@ -150,83 +138,79 @@ return null; } - public static abstract class BundleNode - { + public static abstract class BundleNode { + protected String bundleName; protected Locale locale; - - /* package */ BundleNode(String bundleName, Locale locale) - { + + /* package */ + BundleNode(String bundleName, Locale locale) { this.bundleName = bundleName; this.locale = locale; } - + // if necessary - public void init() {} + public void init() { + } public abstract boolean containsKey(String key); + public abstract String getString(String key); + public abstract Enumeration getKeys(); } public static class NetUIBundleNode - extends BundleNode - { + extends BundleNode { + private ResourceBundle bundle; - - /* package */ NetUIBundleNode(String bundleName, Locale locale) - { + + /* package */ + NetUIBundleNode(String bundleName, Locale locale) { super(bundleName, locale); } - - public void init() - { + + public void init() { if(bundle == null) bundle = ResourceBundle.getBundle(bundleName, locale); } - public boolean containsKey(String key) - { + public boolean containsKey(String key) { return (bundle.getString(key) != null); } - public String getString(String key) - { + public String getString(String key) { return bundle.getString(key); } - public Enumeration getKeys() - { + public Enumeration getKeys() { return bundle.getKeys(); } } public static class StrutsBundleNode - extends BundleNode - { + extends BundleNode { + private String name; private MessageResources messageResource; - /* package */ StrutsBundleNode(String name, Locale locale, MessageResources messageResource) - { + /* package */ + StrutsBundleNode(String name, Locale locale, MessageResources messageResource) { super(null, locale); this.name = name; this.messageResource = messageResource; } - public boolean containsKey(String key) - { + public boolean containsKey(String key) { return (messageResource.getMessage(locale, key) != null); } - public String getString(String key) - { + public String getString(String key) { return messageResource.getMessage(locale, key); } - public Enumeration getKeys() - { + public Enumeration getKeys() { throw new UnsupportedOperationException("The getKeys() method is not supported on a Struts bundle."); } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleMap.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleMap.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleMap.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleMap.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleMap.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleMap.java Wed Jan 19 11:00:31 2005 @@ -37,16 +37,16 @@ /** * Provide a [EMAIL PROTECTED] java.util.Map} of [EMAIL PROTECTED] ScriptableBundle} objects that can expose * various implementations of [EMAIL PROTECTED] BundleContext.BundleNode} to expression languages. - * + * <p/> * This [EMAIL PROTECTED] java.util.Map} implementation is optimized for read as the entrySet() * is created lazily. In addition, the entrySet does not contain all possible ScriptableBundle * objects as named "message-resources" bundles are discovered at runtime and requested by name. - * + * <p/> * todo: need to implement Serializable here as this ends up in the request */ public class BundleMap - extends AbstractScriptableMap -{ + extends AbstractScriptableMap { + private static final Logger _logger = Logger.getInstance(BundleMap.class); private BundleContext _bundleContext = null; @@ -57,14 +57,13 @@ /** * Create a BundleMap object that is used for data binding to resource bundles. * - * @param request the current [EMAIL PROTECTED] javax.servlet.http.HttpServletRequest} object - * @param application a [EMAIL PROTECTED] javax.servlet.ServletContext} object that facilitates binding to - * resource bundles declared in Struts modules + * @param request the current [EMAIL PROTECTED] javax.servlet.http.HttpServletRequest} object + * @param application a [EMAIL PROTECTED] javax.servlet.ServletContext} object that facilitates binding to + * resource bundles declared in Struts modules * @param bundleContext optional [EMAIL PROTECTED] BundleContext} object that describes any existing, data bindable * resource bundles */ - public BundleMap(HttpServletRequest request, ServletContext application, BundleContext bundleContext) - { + public BundleMap(HttpServletRequest request, ServletContext application, BundleContext bundleContext) { assert request != null; assert application != null; @@ -74,19 +73,16 @@ _bundleContext = bundleContext; } - public BundleContext getBundleContext() - { + public BundleContext getBundleContext() { return _bundleContext; } - public Object get(Object name) - { + public Object get(Object name) { assert name instanceof String; return createScriptableBundle((String)name); } - - public boolean containsKey(Object key) - { + + public boolean containsKey(Object key) { if(key == null) return false; @@ -102,19 +98,17 @@ return getDefaultStrutsModuleBundle() != null; else if(_application.getAttribute(name) != null) return getNamedStrutsModuleBundle(name) != null; - else return false; + else + return false; } - public Set entrySet() - { + public Set entrySet() { ArrayList entries = new ArrayList(); // add BundleNode objects that have been explicitly declared - if(_bundleContext != null) - { + if(_bundleContext != null) { Iterator iterator = _bundleContext.getBundleNames(); - while(iterator.hasNext()) - { + while(iterator.hasNext()) { String name = (String)iterator.next(); BundleNode node = _bundleContext.getBundle(name); entries.add(new Entry(name, node)); @@ -125,44 +119,33 @@ MessageResources resources = getDefaultStrutsModuleBundle(); if(resources != null) entries.add(new Entry(BundleContext.DEFAULT_STRUTS_BUNDLE_NAME, - BundleContext.createBundleNode(BundleContext.DEFAULT_STRUTS_BUNDLE_NAME, resources, retrieveUserLocale()))); + BundleContext.createBundleNode(BundleContext.DEFAULT_STRUTS_BUNDLE_NAME, resources, retrieveUserLocale()))); // todo: the named "message-resource" bundles aren't supported here yet; need a way from the JPF runtime to look them up return new EntrySet((Entry[])entries.toArray(new Entry[]{})); } - private Object createScriptableBundle(String name) - { - if(_bundleContext != null && _bundleContext.containsBundle(name)) - { - try - { + private Object createScriptableBundle(String name) { + if(_bundleContext != null && _bundleContext.containsBundle(name)) { + try { return new ScriptableBundle(name, _bundleContext.getBundle(name)); - } - catch(Exception e) - { + } catch(Exception e) { String msg = "Unable to load bundle named \"" + name + "\"; Cause: " + e.getMessage() + ". Cause: " + e; if(_logger.isErrorEnabled()) _logger.error(msg, e); throw new RuntimeException(msg, e); } - } - else if(name.equals(BundleContext.DEFAULT_STRUTS_BUNDLE_NAME)) - { + } else if(name.equals(BundleContext.DEFAULT_STRUTS_BUNDLE_NAME)) { MessageResources resources = getDefaultStrutsModuleBundle(); - if(resources != null) - { + if(resources != null) { BundleNode bundleNode = BundleContext.createBundleNode(name, resources, retrieveUserLocale()); return new ScriptableBundle(name, bundleNode); } - } - else if(_application.getAttribute(name) != null) - { + } else if(_application.getAttribute(name) != null) { MessageResources resources = getNamedStrutsModuleBundle(name); - if(resources != null) - { + if(resources != null) { BundleNode bundleNode = BundleContext.createBundleNode(name, resources, retrieveUserLocale()); return new ScriptableBundle(name, bundleNode); } @@ -183,15 +166,14 @@ * * @return a MessageResources object if a "default" bundle exists. <code>null</code> otherwise */ - private MessageResources getDefaultStrutsModuleBundle() - { + private MessageResources getDefaultStrutsModuleBundle() { Object value = _request.getAttribute(Globals.MESSAGES_KEY); if(value instanceof MessageResources) return (MessageResources)value; - else - { + else { if(value != null) - if(_logger.isWarnEnabled()) _logger.warn("Can not resolve the default module bundle." + + if(_logger.isWarnEnabled()) + _logger.warn("Can not resolve the default module bundle." + " The object resolved from the request is of type " + (value != null ? value.getClass() : "null")); return null; } @@ -203,15 +185,14 @@ * @param name the name of the resource bundle to lookup * @return a MessageResources object if a bundle matching the given name exists. <code>null</code> otherwise. */ - private MessageResources getNamedStrutsModuleBundle(String name) - { + private MessageResources getNamedStrutsModuleBundle(String name) { Object value = _application.getAttribute(name); if(value instanceof MessageResources) return (MessageResources)value; - else - { + else { if(value != null) - if(_logger.isWarnEnabled()) _logger.warn("Can not resolve module bundle with name \"" + name + + if(_logger.isWarnEnabled()) + _logger.warn("Can not resolve module bundle with name \"" + name + "\". The object resolved from ServletContext is of type " + (value != null ? value.getClass() : "null")); return null; } @@ -219,26 +200,25 @@ /** * Utility method that discovers the [EMAIL PROTECTED] java.util.Locale} for the current request. - * + * <p/> * todo: this code is duped in the codebase and needs to be localized into a utility * * @return the [EMAIL PROTECTED] java.util.Locale} to use when doing bundle data binding */ - private final Locale retrieveUserLocale() - { + private final Locale retrieveUserLocale() { String locale = null; Locale userLocale = null; - if (locale == null) { + if(locale == null) { locale = Globals.LOCALE_KEY; } // Only check session if sessions are enabled - if (_session != null) { + if(_session != null) { userLocale = (Locale)_session.getAttribute(locale); } - if (userLocale == null) { + if(userLocale == null) { // Returns Locale based on Accept-Language header or the server default userLocale = _request.getLocale(); } @@ -246,46 +226,40 @@ return userLocale; } - private final String createBundleList() - { + private final String createBundleList() { StringBuilder nameList = new StringBuilder(32); nameList.append("["); - if(_bundleContext != null) - { + if(_bundleContext != null) { Iterator iterator = _bundleContext.getBundleNames(); - for(int i = 0; iterator.hasNext(); i++) - { + for(int i = 0; iterator.hasNext(); i++) { if(i > 0) nameList.append(", "); nameList.append(iterator.next().toString()); } } nameList.append("]"); - + return nameList.toString(); } - - private final String createStrutsBundleList() - { + + private final String createStrutsBundleList() { StringBuilder strutsNameList = new StringBuilder(32); strutsNameList.append("["); ModuleConfig config = (ModuleConfig)_request.getAttribute(Globals.MODULE_KEY); - if(config != null) - { + if(config != null) { MessageResourcesConfig[] mrs = config.findMessageResourcesConfigs(); - if(mrs != null) - { - for(int i = 0; i < mrs.length; i++) - { + if(mrs != null) { + for(int i = 0; i < mrs.length; i++) { if(i > 0) strutsNameList.append(", "); - + if(mrs[i].getKey().equals(Globals.MESSAGES_KEY)) strutsNameList.append("default"); - else strutsNameList.append(mrs[i].getKey() + config.getPrefix()); + else + strutsNameList.append(mrs[i].getKey() + config.getPrefix()); } } } strutsNameList.append("]"); - + return strutsNameList.toString(); } @@ -294,17 +268,16 @@ * [EMAIL PROTECTED] org.apache.beehive.netui.script.common.BundleContext.BundleNode} object * to an expression language as a Map. Access to the values in the map is by * key and depends on the implementation of the BundleNode. - * + * <p/> * Access is read optimized and the complete entrySet() is only constructed when needed. */ public class ScriptableBundle - extends AbstractScriptableMap - { + extends AbstractScriptableMap { + private BundleNode _bundle = null; private String _propertiesName = null; - ScriptableBundle(String propertiesName, BundleNode bundle) - { + ScriptableBundle(String propertiesName, BundleNode bundle) { assert bundle != null; assert propertiesName != null; @@ -312,36 +285,31 @@ _propertiesName = propertiesName; } - public Set entrySet() - { + public Set entrySet() { ArrayList list = new ArrayList(); Enumeration enumeration = _bundle.getKeys(); - while(enumeration.hasMoreElements()) - { + while(enumeration.hasMoreElements()) { String key = (String)enumeration.nextElement(); String msg = _bundle.getString(key); list.add(new Entry(key, msg)); } - return new EntrySet((Entry[])list.toArray(new Entry[] {})); + return new EntrySet((Entry[])list.toArray(new Entry[]{})); } - public Object get(Object name) - { + public Object get(Object name) { assert name instanceof String; String result = _bundle.getString((String)name); - - if(result == null) - { + + if(result == null) { String msg = "The bundle property name \"" + name + "\" could not be found in the properties bundle \"" + _propertiesName + "\"."; if(_logger.isErrorEnabled()) _logger.error(msg); throw new RuntimeException(msg); - } - else return result; + } else + return result; } - public boolean containsKey(Object key) - { + public boolean containsKey(Object key) { return _bundle.getString(key.toString()) != null; } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ContextFactory.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ContextFactory.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ContextFactory.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ContextFactory.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ContextFactory.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ContextFactory.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.script.common; // java imports + import javax.servlet.jsp.el.VariableResolver; // internal imports @@ -27,7 +28,7 @@ /** * */ -public abstract class ContextFactory -{ +public abstract class ContextFactory { + public abstract Object getInstance(VariableResolver vr); } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderBean.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderBean.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderBean.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderBean.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderBean.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderBean.java Wed Jan 19 11:00:31 2005 @@ -20,6 +20,7 @@ // java imports // internal imports + import org.apache.beehive.netui.util.logging.Logger; // external imports @@ -27,34 +28,29 @@ /** * */ -public class DataAccessProviderBean -{ +public class DataAccessProviderBean { + private static final Logger _logger = Logger.getInstance(DataAccessProviderBean.class); private IDataAccessProvider _provider = null; - public DataAccessProviderBean(IDataAccessProvider provider) - { + public DataAccessProviderBean(IDataAccessProvider provider) { _provider = provider; } - public Object getItem() - { + public Object getItem() { return _provider.getCurrentItem(); } - public Object getContainer() - { + public Object getContainer() { return new DataAccessProviderBean(_provider.getProviderParent()); } - - public int getIndex() - { + + public int getIndex() { return _provider.getCurrentIndex(); } - - public Object getMetadata() - { + + public Object getMetadata() { return _provider.getCurrentMetadata(); } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderStack.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderStack.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderStack.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderStack.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderStack.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderStack.java Wed Jan 19 11:00:31 2005 @@ -20,79 +20,71 @@ import java.util.Stack; import javax.servlet.jsp.JspContext; -public class DataAccessProviderStack -{ +public class DataAccessProviderStack { + private static final String KEY = "org.apache.beehive.netui.script.common.DataAccessProviderStack"; private Stack _stack = null; - public static final void addDataAccessProvider(IDataAccessProvider provider, JspContext jspContext) - { - assert jspContext != null; + public static final void addDataAccessProvider(IDataAccessProvider provider, JspContext jspContext) { + assert jspContext != null; DataAccessProviderBean bean = new DataAccessProviderBean(provider); - + Object val = jspContext.getAttribute(KEY); DataAccessProviderStack curStack = null; - if(val == null) - { + if(val == null) { curStack = new DataAccessProviderStack(); jspContext.setAttribute(KEY, curStack); - } - else curStack = (DataAccessProviderStack)val; + } else + curStack = (DataAccessProviderStack)val; curStack.push(bean); - + jspContext.setAttribute("container", bean); return; } - public static final DataAccessProviderBean removeDataAccessProvider(JspContext jspContext) - { - assert jspContext != null; + public static final DataAccessProviderBean removeDataAccessProvider(JspContext jspContext) { + assert jspContext != null; Object val = jspContext.getAttribute(KEY); - if(val != null) - { + if(val != null) { DataAccessProviderStack curStack = (DataAccessProviderStack)val; DataAccessProviderBean lastTop = curStack.pop(); if(!curStack.isEmpty()) jspContext.setAttribute("container", curStack.peek()); - else jspContext.removeAttribute("container"); + else + jspContext.removeAttribute("container"); return lastTop; } - // todo: should this thrown an IllegalStateException? + // todo: should this thrown an IllegalStateException? - return null; + return null; } - public DataAccessProviderStack() - { + public DataAccessProviderStack() { _stack = new Stack(); } - public boolean isEmpty() - { + public boolean isEmpty() { return _stack.empty(); } - public DataAccessProviderBean peek() - { + public DataAccessProviderBean peek() { return (DataAccessProviderBean)_stack.peek(); } - public DataAccessProviderBean pop() - { + public DataAccessProviderBean pop() { return (DataAccessProviderBean)_stack.pop(); } - public void push(DataAccessProviderBean bean) - { + public void push(DataAccessProviderBean bean) { _stack.push(bean); } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/IDataAccessProvider.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/IDataAccessProvider.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/IDataAccessProvider.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/IDataAccessProvider.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/IDataAccessProvider.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/IDataAccessProvider.java Wed Jan 19 11:00:31 2005 @@ -38,13 +38,13 @@ * <tr><td>getDataSource()</td><td><code>container.dataSource</code></td><td>Yes</td></tr> * <tr><td>getProviderParent()</td><td><code>container.container</code></td><td>Yes</td></tr> * </table> - * <p> + * <p/> * In cases where a IDataAccessProvider contains another IDataAccessProvider, the * grandparent IDataAccessProvider may be referenced with the binding expression * <code>container.container</code>. For example, the item, with the property firstName, * may be accessed with the expression <code>container.container.item.firstName</code>. * </p> - * <p> + * <p/> * The general use of the IDataAccessProvider is as an interface that is implemented * by repeating databound tags that iterate over a data set and render each item * in that data set. The item and iteration index are exposed through this @@ -53,17 +53,19 @@ * should start with <code>container</code> and reference one of the properties above. * </p> */ -public interface IDataAccessProvider -{ +public interface IDataAccessProvider { + /** * Get the current index in this iteration. This should be a * zero based integer that increments after each iteration. + * * @return the current index of iteration or 0 */ public int getCurrentIndex(); /** * Get the current data item in this IDataAccessProvider. + * * @return the current data item or <code>null</code> */ public Object getCurrentItem(); @@ -71,6 +73,7 @@ /** * Get the expression that references the data item to which the * IDataAccessProvider is bound. + * * @return the expression referencing the data source or <code>null</code> if no * dataSource is set */ @@ -82,6 +85,7 @@ * provided by the IDataAccessProvider interface. See these * implementations for information about their support for * current item metadata. + * * @return the current metadata or <code>null</code> if no metadata can be * found or metadata is not supported by a IDataAccessProvider implementation */ @@ -94,6 +98,7 @@ * providers. Implementations of this interface are left with having * to discover and export parents. The return value from this call * on an implementing Object can be <code>null</code>. + * * @return the parent DataAccessProvider or <code>null</code> if this method * is not supported or the parent can not be found. */ Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java Wed Jan 19 11:00:31 2005 @@ -49,8 +49,8 @@ /** * */ -public class ImplicitObjectUtil -{ +public class ImplicitObjectUtil { + private static final Logger LOGGER = Logger.getInstance(ImplicitObjectUtil.class); private static final String PAGE_FLOW_IMPLICIT_OBJECT_KEY = "pageFlow"; private static final String SHARED_FLOW_IMPLICIT_OBJECT_KEY = "sharedFlow"; @@ -61,20 +61,18 @@ private static final String ACTION_FORM_IMPLICIT_OBJECT_KEY = "actionForm"; private static final String OUTPUT_FORM_BEAN_OBJECT_KEY = "outputFormBean"; - private ImplicitObjectUtil() {} + private ImplicitObjectUtil() { + } - public static final void loadActionForm(JspContext jspContext, Object form) - { + public static final void loadActionForm(JspContext jspContext, Object form) { jspContext.setAttribute(ACTION_FORM_IMPLICIT_OBJECT_KEY, unwrapForm(form)); } - public static final void unloadActionForm(JspContext jspContext) - { + public static final void unloadActionForm(JspContext jspContext) { jspContext.removeAttribute(ACTION_FORM_IMPLICIT_OBJECT_KEY); } - - public static final void loadPageFlow(ServletRequest request, PageFlowController pageFlow, FacesBackingBean fbb) - { + + public static final void loadPageFlow(ServletRequest request, PageFlowController pageFlow, FacesBackingBean fbb) { if(pageFlow == null) return; @@ -86,47 +84,41 @@ request.setAttribute(PAGE_INPUT_IMPLICIT_OBJECT_KEY, map != null ? map : Collections.EMPTY_MAP); } - public static final void loadSharedFlow(ServletRequest request, Map<String, SharedFlowController> sharedFlows) - { - if (sharedFlows != null) + public static final void loadSharedFlow(ServletRequest request, Map<String, SharedFlowController> sharedFlows) { + if(sharedFlows != null) request.setAttribute(SHARED_FLOW_IMPLICIT_OBJECT_KEY, sharedFlows); } - - public static final void loadGlobalApp(ServletRequest request, GlobalApp globalApp) - { - if (globalApp != null) + + public static final void loadGlobalApp(ServletRequest request, GlobalApp globalApp) { + if(globalApp != null) request.setAttribute(GLOBAL_APP_IMPLICIT_OBJECT_KEY, globalApp); } - public static final void loadBundleMap(ServletRequest servletRequest, BundleMap bundleMap) - { + public static final void loadBundleMap(ServletRequest servletRequest, BundleMap bundleMap) { servletRequest.setAttribute(BUNDLE_IMPLICIT_OBJECT_KEY, bundleMap); } - public static final Object unwrapForm(Object form) - { + public static final Object unwrapForm(Object form) { if(LOGGER.isDebugEnabled() && form instanceof AnyBeanActionForm) LOGGER.debug("using form of type: " + ((AnyBeanActionForm)form != null ? ((AnyBeanActionForm)form).getClass().getName() : "null")); if(form instanceof AnyBeanActionForm) return ((AnyBeanActionForm)form).getBean(); - else return form; + else + return form; } - public static final Map<String, SharedFlowController> getSharedFlow(ServletRequest request) - { + public static final Map<String, SharedFlowController> getSharedFlow(ServletRequest request) { return (Map<String, SharedFlowController>)request.getAttribute(SHARED_FLOW_IMPLICIT_OBJECT_KEY); } - public static final PageFlowController getPageFlow(ServletRequest request, ServletResponse response) - { + public static final PageFlowController getPageFlow(ServletRequest request, ServletResponse response) { assert request instanceof HttpServletRequest; PageFlowController jpf = PageFlowUtils.getCurrentPageFlow((HttpServletRequest)request); if(jpf != null) return jpf; - else - { + else { // @todo: i18n RuntimeException re = new RuntimeException("There is no current PageFlow for the expression."); if(LOGGER.isErrorEnabled()) LOGGER.error("", re); @@ -134,14 +126,12 @@ } } - public static final GlobalApp getGlobalApp(ServletRequest request, ServletResponse response) - { + public static final GlobalApp getGlobalApp(ServletRequest request, ServletResponse response) { assert request instanceof HttpServletRequest; GlobalApp ga = PageFlowUtils.getGlobalApp((HttpServletRequest)request); - if(ga == null) - { + if(ga == null) { // @todo: i18n RuntimeException re = new RuntimeException("Can not create the globalApp binding context; the GlobalApp object is null."); if(LOGGER.isErrorEnabled()) LOGGER.error("", re); @@ -156,20 +146,18 @@ * * @throws RuntimeException if a factory for the given context name could not be resolved */ - public static final Object getImplicitObject(Map factories, VariableResolver vr, String name) - { + public static final Object getImplicitObject(Map factories, VariableResolver vr, String name) { assert factories != null; ContextFactory factory = (ContextFactory)factories.get(name); - if(factory == null) - { + if(factory == null) { // @todo: i18n String msg = "Could not resolve ContextFactory for binding context named \"" + name + "\""; if(LOGGER.isErrorEnabled()) LOGGER.error(msg); throw new RuntimeException(msg); } - + return factory.getInstance(vr); } @@ -199,8 +187,7 @@ * Read entires from the netui-config.xml file and add the objects * to this implicit object map. */ - public static final Map initialize(String languageName) - { + public static final Map initialize(String languageName) { NetuiConfig netuiConfig = ConfigUtil.getConfig(); if(netuiConfig == null) return null; ExpressionLanguages languages = netuiConfig.getExpressionLanguages(); @@ -208,8 +195,7 @@ ExpressionLanguage[] langArray = languages.getExpressionLanguageArray(); if(langArray == null) return null; ExpressionLanguage language = null; - for(int i = 0; i < langArray.length; i++) - { + for(int i = 0; i < langArray.length; i++) { if(langArray[i].getName().equals(languageName)) language = langArray[i]; } @@ -223,89 +209,75 @@ LinkedHashMap map = new LinkedHashMap(); ContextFactory factory = null; Iterator iterator = config.keySet().iterator(); - while(iterator.hasNext()) - { + while(iterator.hasNext()) { String name = (String)iterator.next(); String className = (String)config.get(name); // try to find the ContextFactory implementation - try - { + try { // @todo: need to use a context classloader here Class type = Class.forName(className); factory = (ContextFactory)type.newInstance(); - } - catch(ClassNotFoundException cnf) - { + } catch(ClassNotFoundException cnf) { if(LOGGER.isWarnEnabled()) LOGGER.warn("Could not create a ContextFactory for type \"" + className + "\" because the ContextFactory implementation class could not be found."); - + continue; - } - catch(Exception ex) - { + } catch(Exception ex) { if(LOGGER.isWarnEnabled()) LOGGER.warn("Could not create a ContextFactory for type \"" + className + - "\" because an error occurred creating the factory. Cause: " + ex, ex); + "\" because an error occurred creating the factory. Cause: " + ex, ex); continue; } - - if(map.containsKey(name)) - { + + if(map.containsKey(name)) { if(LOGGER.isWarnEnabled()) LOGGER.warn("Overwriting a previously defined ContextFactory named \"" + name + - "\" with a new ContextFactory of type \"" + className + "\""); - } - else - { + "\" with a new ContextFactory of type \"" + className + "\""); + } else { if(LOGGER.isInfoEnabled()) LOGGER.info("Adding a ContextFactory named \"" + name + "\" with implementation \"" + className + "\""); } - + map.put(name, factory); } return map; } - private static final Map readFromConfig(ExpressionLanguage language) - { + private static final Map readFromConfig(ExpressionLanguage language) { assert language != null; - BindingContexts contexts = language.getBindingContexts(); + BindingContexts contexts = language.getBindingContexts(); if(contexts == null) return null; org.apache.beehive.netui.util.config.bean.BindingContexts.BindingContext[] array = contexts.getBindingContextArray(); if(array == null) return null; - + LinkedHashMap map = new LinkedHashMap(); - for(int i = 0; i < array.length; i++) - { + for(int i = 0; i < array.length; i++) { map.put(array[i].getName(), array[i].getFactoryClass()); } - + return map; } - - public static void loadImplicitObjects(HttpServletRequest request, HttpServletResponse response, ServletContext servletContext, PageFlowController curJpf) - { + + public static void loadImplicitObjects(HttpServletRequest request, HttpServletResponse response, ServletContext servletContext, PageFlowController curJpf) { // @todo: need to wrap this in checks for JSP 1.2 // @todo: feature: need to add support for chaining in user-code to run when setting implicit objects on the request - if ( curJpf != null ) - { + if(curJpf != null) { FacesBackingBean fbb = - FacesBackingBeanFactory.getFacesBackingBeanForRequest( request, response, servletContext ); - loadPageFlow( request, curJpf, fbb ); + FacesBackingBeanFactory.getFacesBackingBeanForRequest(request, response, servletContext); + loadPageFlow(request, curJpf, fbb); } // @todo: need to move bundleMap creation to a BundleMapFactory - BundleMap bundleMap = new BundleMap( request, servletContext, null ); - loadBundleMap( request, bundleMap ); + BundleMap bundleMap = new BundleMap(request, servletContext, null); + loadBundleMap(request, bundleMap); } - - public static final void loadOutputFormBean(ServletRequest request, Object bean) - { - if (bean != null) + + public static final void loadOutputFormBean(ServletRequest request, Object bean) { + if(bean != null) request.setAttribute(OUTPUT_FORM_BEAN_OBJECT_KEY, bean); } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ScriptablePageInput.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ScriptablePageInput.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ScriptablePageInput.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ScriptablePageInput.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ScriptablePageInput.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ScriptablePageInput.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.script.common; // java imports + import java.util.ArrayList; import java.util.Iterator; import java.util.Map; @@ -37,27 +38,25 @@ * Provide a [EMAIL PROTECTED] java.util.Map} object that exposes a set of page inputs to * expression language clients. Access to these page inputs is based on the * name of the page input. - * + * <p/> * Access is optimized for read in that the "get" method is fast. The entrySet() * method is only used if needed, which is generally to toString the Map. */ public class ScriptablePageInput - extends AbstractScriptableMap -{ + extends AbstractScriptableMap { + private static final Logger _logger = Logger.getInstance(ScriptablePageInput.class); private HttpServletRequest _request = null; private Set _entrySet = null; - public ScriptablePageInput(ServletRequest request) - { + public ScriptablePageInput(ServletRequest request) { assert request instanceof HttpServletRequest; _request = (HttpServletRequest)request; } - public Object get(Object name) - { + public Object get(Object name) { if(_logger.isDebugEnabled()) _logger.debug("page input get: " + name); assert name instanceof String; @@ -70,19 +69,16 @@ * assumes that the page input set does not change, which is acceptable for * JSP clients as the page inputs have been specified when the JSP starts * to render. + * * @return Set */ - public Set entrySet() - { - if(_entrySet == null) - { + public Set entrySet() { + if(_entrySet == null) { Map piMap = InternalUtils.getPageInputMap(_request); ArrayList list = new ArrayList(); - if(piMap != null) - { + if(piMap != null) { Iterator iterator = piMap.keySet().iterator(); - while(iterator.hasNext()) - { + while(iterator.hasNext()) { Object name = iterator.next(); Object value = piMap.get(name); list.add(new Entry(name, value)); @@ -94,16 +90,14 @@ return _entrySet; } - - public boolean equals(Object obj) - { + + public boolean equals(Object obj) { if(obj == null || !(obj instanceof ScriptablePageInput)) return false; return super.equals(obj); } - - public boolean containsKey(Object key) - { + + public boolean containsKey(Object key) { Map piMap = InternalUtils.getPageInputMap(_request); return (piMap != null ? piMap.containsKey(key) : false); } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionEvaluatorImpl.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionEvaluatorImpl.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionEvaluatorImpl.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionEvaluatorImpl.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionEvaluatorImpl.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionEvaluatorImpl.java Wed Jan 19 11:00:31 2005 @@ -31,72 +31,63 @@ * */ public class ExpressionEvaluatorImpl - implements ExpressionEvaluator -{ + implements ExpressionEvaluator { + private static final Logger _logger = Logger.getInstance(ExpressionEvaluatorImpl.class); private static final boolean DEBUG_ENABLED = _logger.isDebugEnabled(); public static class NetUIELEngineFactory - extends org.apache.beehive.netui.script.ExpressionEngineFactory - { - public ExpressionEvaluator getInstance() - { + extends org.apache.beehive.netui.script.ExpressionEngineFactory { + + public ExpressionEvaluator getInstance() { return new ExpressionEvaluatorImpl(); } } public Object evaluateStrict(String expression, VariableResolver variableResolver) - throws ExpressionEvaluationException - { + throws ExpressionEvaluationException { NetUIReadVariableResolver vr = null; - try - { + try { /* todo: is there compelling enough reson to keep this code here? */ vr = new NetUIReadVariableResolver(variableResolver); return ParseUtils.evaluate(expression, vr); - } - catch(Exception e) - { + } catch(Exception e) { if(DEBUG_ENABLED) _logger.debug("Expression evaluation failed in NetUIEL. Cause: " + e, e); Exception act = e; String contextStr = ParseUtils.getContextString(vr.getAvailableVariables()); - String msg = "Caught exception when evaluating expression \"" + expression + "\" with available binding contexts " + + String msg = "Caught exception when evaluating expression \"" + expression + "\" with available binding contexts " + contextStr + ". Root cause: " + ParseUtils.getRootCause(act).toString(); if(_logger.isErrorEnabled()) _logger.error(msg, act); - + throw new ExpressionEvaluationException(msg, expression, act); } } public void update(String expression, Object value, VariableResolver variableResolver, boolean requestParameter) - throws ExpressionUpdateException - { + throws ExpressionUpdateException { assert variableResolver instanceof NetUIVariableResolver; NetUIVariableResolver vr = (NetUIVariableResolver)variableResolver; - try - { + try { if(DEBUG_ENABLED) _logger.debug("Update expression \"" + expression + "\""); ParseUtils.update(expression, value, vr); - } - catch(Exception e) - { + } catch(Exception e) { if(DEBUG_ENABLED) _logger.debug("Expression update failed in NetUIEL. Cause: " + e, e); String contextStr = ParseUtils.getContextString(vr.getAvailableVariables()); - String msg = "Exception when attempting to update the expression \"" + expression + "\" with available binding contexts " + + String msg = "Exception when attempting to update the expression \"" + expression + "\" with available binding contexts " + contextStr + ". Root cause: " + ParseUtils.getRootCause(e).toString(); - + if(_logger.isErrorEnabled()) _logger.error(msg, e); @@ -109,16 +100,12 @@ /* todo: fix the lookup index to be Object */ public String changeContext(String expression, String oldContext, String newContext, int lookupIndex) - throws ExpressionEvaluationException - { - try - { + throws ExpressionEvaluationException { + try { ParsedExpression pe = ParseUtils.parse(expression); return pe.changeContext(oldContext, newContext, new Integer(lookupIndex)); - } - catch(Exception e) - { - String msg = "Error when trying to replace old context '" + oldContext + "' with new context '" + + } catch(Exception e) { + String msg = "Error when trying to replace old context '" + oldContext + "' with new context '" + newContext + "' and index '" + lookupIndex + "': " + ParseUtils.getRootCause(e).toString(); if(_logger.isErrorEnabled()) _logger.error(msg, e); @@ -128,54 +115,44 @@ } public String qualify(String contextName, String expression) - throws ExpressionEvaluationException - { - try - { + throws ExpressionEvaluationException { + try { ParsedExpression pe = ParseUtils.parse(expression); return pe.qualify(contextName); - } - catch(Exception e) - { - String msg = "Error when trying to create an expression in namespace \"" + contextName + "\" with fragment \"" + + } catch(Exception e) { + String msg = "Error when trying to create an expression in namespace \"" + contextName + "\" with fragment \"" + expression + "\". Root cause: " + ParseUtils.getRootCause(e).toString(); throw new ExpressionEvaluationException(msg, e); } } - public boolean isExpression(String expression) - { - try - { + public boolean isExpression(String expression) { + try { ParsedExpression pe = ParseUtils.parse(expression); return pe.isExpression(); - } - catch(Exception e) - { - if(_logger.isErrorEnabled()) _logger.error("Exception parsing expression \"" + expression + "\". Cause: " + - ParseUtils.getRootCause(e).toString(), e); + } catch(Exception e) { + if(_logger.isErrorEnabled()) + _logger.error("Exception parsing expression \"" + expression + "\". Cause: " + + ParseUtils.getRootCause(e).toString(), e); if(e instanceof IllegalExpressionException) throw (IllegalExpressionException)e; else if(e instanceof ExpressionParseException) throw new IllegalExpressionException(e); - else return false; + else + return false; } } - - public boolean containsExpression(String expression) - { + + public boolean containsExpression(String expression) { if(expression == null) return false; - try - { + try { ParsedExpression pe = ParseUtils.parse(expression); assert pe != null; return pe.containsExpression(); - } - catch(Exception e) - { + } catch(Exception e) { if(_logger.isErrorEnabled()) _logger.error("Exception checking for expressions in \"" + expression + "\"", e); @@ -183,14 +160,12 @@ } } - public Expression parseExpression(String expression) - { - if(isExpression(expression)) - { + public Expression parseExpression(String expression) { + if(isExpression(expression)) { ParsedExpression pe = ParseUtils.parse(expression); assert pe != null; return pe.getAtomicExpressionTerm(); - } - else throw new IllegalExpressionException("The expression \"" + expression + "\" can not be parsed as it is not an atomic expression."); + } else + throw new IllegalExpressionException("The expression \"" + expression + "\" can not be parsed as it is not an atomic expression."); } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionParseException.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionParseException.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionParseException.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionParseException.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionParseException.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionParseException.java Wed Jan 19 11:00:31 2005 @@ -21,43 +21,35 @@ * */ public class ExpressionParseException - extends RuntimeException -{ + extends RuntimeException { /** * * - */ - public ExpressionParseException() - { + */ + public ExpressionParseException() { super(); } - /** - * - * @param message - */ - public ExpressionParseException(String message) - { + /** + * @param message + */ + public ExpressionParseException(String message) { super(message); } - /** - * - * @param cause - */ - public ExpressionParseException(Throwable cause) - { + /** + * @param cause + */ + public ExpressionParseException(Throwable cause) { super(cause); } - /** - * - * @param message - * @param cause - */ - public ExpressionParseException(String message, Throwable cause) - { + /** + * @param message + * @param cause + */ + public ExpressionParseException(String message, Throwable cause) { super(message, cause); } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionTerm.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionTerm.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionTerm.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionTerm.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionTerm.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionTerm.java Wed Jan 19 11:00:31 2005 @@ -37,8 +37,8 @@ */ public class ExpressionTerm extends Expression - implements Term -{ + implements Term { + private static Logger _logger = Logger.getInstance(ExpressionTerm.class); private List tokens = null; @@ -47,64 +47,52 @@ private ExpressionToken[] tokenArray = null; private List _noModTokens = null; - public ExpressionTerm() - { + public ExpressionTerm() { super(); tokens = new ArrayList(); } - public void seal() - { + public void seal() { context = (ContextToken)tokens.get(0); tokenArray = new ExpressionToken[tokens.size()]; StringBuffer buf = new StringBuffer(); - for(int i = 0; i < tokens.size(); i++) - { + for(int i = 0; i < tokens.size(); i++) { buf.append(((ExpressionToken)tokens.get(i)).getTokenString()); tokenArray[i] = (ExpressionToken)tokens.get(i); } - + exprStr = buf.toString(); _noModTokens = Collections.unmodifiableList(tokens); } - public String getContext() - { + public String getContext() { return context.getName(); } - public List getTokens() - { + public List getTokens() { return _noModTokens; } - public String getExpression(int start) - { + public String getExpression(int start) { if(start >= tokens.size()) - throw new IllegalStateException("The index \"" + start + "\" is an invalid reference into an expression with \"" + - tokens.size() + "\" tokens."); + throw new IllegalStateException("The index \"" + start + "\" is an invalid reference into an expression with \"" + + tokens.size() + "\" tokens."); boolean needDot = true; StringBuffer buf = new StringBuffer(); buf.append("{"); - for(int i = start; i < tokens.size(); i++) - { + for(int i = start; i < tokens.size(); i++) { ExpressionToken tok = (ExpressionToken)tokens.get(i); - if(tok instanceof ArrayIndexToken) - { + if(tok instanceof ArrayIndexToken) { buf.append(tok.getTokenString()); needDot = false; - } - else if(tok instanceof IdentifierToken) - { + } else if(tok instanceof IdentifierToken) { if(needDot && i != start) buf.append("."); buf.append(tok.toString()); needDot = true; - } - else if(tok instanceof MapKeyToken) - { + } else if(tok instanceof MapKeyToken) { buf.append(tok.getTokenString()); needDot = false; } @@ -113,43 +101,36 @@ return buf.toString(); } - public void addToken(ExpressionToken token) - { + public void addToken(ExpressionToken token) { tokens.add(token); } - public Iterator getExpressionTokens() - { + public Iterator getExpressionTokens() { return tokens.iterator(); } - public int getTokenCount() - { + public int getTokenCount() { return tokenArray.length; } - - public ExpressionToken getToken(int index) - { + + public ExpressionToken getToken(int index) { // @TODO: error checking return tokenArray[index]; } - public String getExpressionString() - { + public String getExpressionString() { return exprStr; } - public Object evaluate(NetUIVariableResolver vr) - { + public Object evaluate(NetUIVariableResolver vr) { return _evaluate(tokens.size(), vr); } - - public void update(Object newValue, NetUIVariableResolver vr) - { + + public void update(Object newValue, NetUIVariableResolver vr) { // find leaf - Object branch = _evaluate(tokens.size()-1, vr); - - ExpressionToken token = tokenArray[tokens.size()-1]; + Object branch = _evaluate(tokens.size() - 1, vr); + + ExpressionToken token = tokenArray[tokens.size() - 1]; if(_logger.isDebugEnabled()) _logger.debug("Update leaf token: " + token + " on object: " + branch); @@ -158,31 +139,27 @@ } // @TODO: this could be done more effectively / efficiently - public String changeContext(String oldContext, String newContext, Object index) - { + public String changeContext(String oldContext, String newContext, Object index) { String thisExpr = getExpressionString(); if(_logger.isDebugEnabled()) _logger.debug("oldContext: " + oldContext + " newContext: " + newContext + " thisExpr: " + thisExpr); // needs to be checked for atomicity ParsedExpression pe = ParseUtils.parse(newContext); - - if(!pe.isExpression()) - { + + if(!pe.isExpression()) { String msg = "The expression can not be qualified into new context because the new context is not atomic."; if(_logger.isErrorEnabled()) _logger.error(msg); throw new RuntimeException(msg); } // this isn't a failure; it just means that there isn't anything else to replace - if(!thisExpr.startsWith(oldContext)) - { - return "{" + thisExpr + "}"; - } - - if(index instanceof Integer && ((Integer)index).intValue() > 32767) - { - String msg = "Can not create an indexed expression with an array index greater than the Java array limit for the expression \"" + + if(!thisExpr.startsWith(oldContext)) { + return "{" + thisExpr + "}"; + } + + if(index instanceof Integer && ((Integer)index).intValue() > 32767) { + String msg = "Can not create an indexed expression with an array index greater than the Java array limit for the expression \"" + thisExpr + "\""; if(_logger.isWarnEnabled()) _logger.warn(msg); @@ -205,8 +182,7 @@ return buf.toString(); } - public String qualify(String contextName) - { + public String qualify(String contextName) { StringBuffer buf = new StringBuffer(); buf.append("{"); buf.append(contextName); @@ -217,45 +193,36 @@ return buf.toString(); } - public String toString() - { + public String toString() { StringBuffer buf = new StringBuffer(); buf.append("ExpressionTerm:\n"); - for(int i = 0; i < tokens.size(); i++) - { + for(int i = 0; i < tokens.size(); i++) { buf.append(" " + tokens.get(i).toString() + "\n"); } return buf.toString(); } - private final Object _evaluate(int index, NetUIVariableResolver vr) - { + private final Object _evaluate(int index, NetUIVariableResolver vr) { Object result = null; - if(tokens.size() == 1) - { + if(tokens.size() == 1) { if(_logger.isDebugEnabled()) _logger.debug("found single term expression"); result = vr.resolveVariable(context.getName()); - if(result != null && result instanceof BindingContext) - { - if(_logger.isDebugEnabled()) + if(result != null && result instanceof BindingContext) { + if(_logger.isDebugEnabled()) _logger.debug("result is of type BindingContext; return type: " + (((BindingContext)result).unwrap().getClass())); return ((BindingContext)result).unwrap(); - } - else return result; - } - else - { - for(int i = 0; i < index; i++) - { - if(i == 0) - { + } else + return result; + } else { + for(int i = 0; i < index; i++) { + if(i == 0) { result = vr.resolveVariable(context.getName()); - } - else result = tokenArray[i].evaluate(result); + } else + result = tokenArray[i].evaluate(result); } return result; Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/LiteralTerm.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/LiteralTerm.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/LiteralTerm.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/LiteralTerm.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/LiteralTerm.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/LiteralTerm.java Wed Jan 19 11:00:31 2005 @@ -23,40 +23,36 @@ * */ public class LiteralTerm - implements Term -{ + implements Term { + private static final Logger logger = Logger.getInstance(LiteralTerm.class); private String text = null; - public LiteralTerm(String text) - { + public LiteralTerm(String text) { super(); // hack for Radar 39861. probably being lazy in not fixing the grammar... if(text.equals("\\{")) this.text = "{"; - else this.text = text; + else + this.text = text; if(logger.isDebugEnabled()) logger.debug("LiteralTerm text: " + text + " this.text: " + this.text); } - public void seal() - { + public void seal() { } - public String getExpressionString() - { + public String getExpressionString() { return text; } - public Object evaluate(NetUIVariableResolver vr) - { + public Object evaluate(NetUIVariableResolver vr) { return text; } - public String toString() - { + public String toString() { return "LiteralTerm:\n " + text + "\n"; } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIReadVariableResolver.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIReadVariableResolver.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIReadVariableResolver.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIReadVariableResolver.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIReadVariableResolver.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIReadVariableResolver.java Wed Jan 19 11:00:31 2005 @@ -41,10 +41,10 @@ try { return _vr.resolveVariable(name); - } catch (javax.servlet.jsp.el.ELException ele) { + } catch(javax.servlet.jsp.el.ELException ele) { RuntimeException re = new RuntimeException("Could not resolve variable named \"" + name + "\"", new IllegalExpressionException()); - if (_logger.isErrorEnabled()) + if(_logger.isErrorEnabled()) _logger.error("", re); throw re; Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIUpdateVariableResolver.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIUpdateVariableResolver.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIUpdateVariableResolver.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIUpdateVariableResolver.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIUpdateVariableResolver.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIUpdateVariableResolver.java Wed Jan 19 11:00:31 2005 @@ -38,8 +38,8 @@ */ public class NetUIUpdateVariableResolver extends NetUIVariableResolver - implements VariableResolver -{ + implements VariableResolver { + private static final Logger _logger = Logger.getInstance(NetUIVariableResolver.class); private boolean _requestParameter = true; @@ -47,18 +47,16 @@ private ServletRequest _request = null; private ServletResponse _response = null; - public NetUIUpdateVariableResolver(Object form, ServletRequest request, ServletResponse response, boolean requestParameter) - { + public NetUIUpdateVariableResolver(Object form, ServletRequest request, ServletResponse response, boolean requestParameter) { super(); - + _requestParameter = requestParameter; _form = form; _request = request; _response = response; } - public Object resolveVariable(String name) - { + public Object resolveVariable(String name) { if(name.equals("actionForm")) return _form; else if(name.equals("pageFlow")) @@ -67,27 +65,24 @@ return getGlobalApp(_request, _response); else if(name.equals("sharedFlow")) return getSharedFlow(_request, _response); - else if(name.equals("requestScope")) - { + else if(name.equals("requestScope")) { if(_requestParameter == false) return new RequestAttributeMap(_request); - else throw new IllegalExpressionException("The request data binding context can not be updated from a request parameter."); - } - else if(name.equals("sessionScope")) - { + else + throw new IllegalExpressionException("The request data binding context can not be updated from a request parameter."); + } else if(name.equals("sessionScope")) { if(_requestParameter == false) - return new SessionAttributeMap(((HttpServletRequest)_request).getSession()); - else throw new IllegalExpressionException("The session data binding context can not be updated from a request parameter."); + return new SessionAttributeMap(((HttpServletRequest)_request).getSession()); + else + throw new IllegalExpressionException("The session data binding context can not be updated from a request parameter."); } // @bug: need to get the ServletContext from somewhere - else if(name.equals("applicationScope")) - { + else if(name.equals("applicationScope")) { if(_requestParameter == false) return null; - else throw new IllegalExpressionException("The application data binding context can not be updated from a request parameter."); - } - else - { + else + throw new IllegalExpressionException("The application data binding context can not be updated from a request parameter."); + } else { String msg = "Could not resolve variable named \"" + name + "\" for an expression update."; if(_logger.isErrorEnabled()) _logger.error(msg); @@ -96,25 +91,22 @@ } } - public String[] getAvailableVariables() - { + public String[] getAvailableVariables() { if(_requestParameter) - return new String[] {"actionForm", "pageFlow", "globalApp"}; - else return new String[] {"actionForm", "pageFlow", "globalApp", "request", "session", "application"}; + return new String[]{"actionForm", "pageFlow", "globalApp"}; + else + return new String[]{"actionForm", "pageFlow", "globalApp", "request", "session", "application"}; } - private static final Map<String, SharedFlowController> getSharedFlow(ServletRequest request, ServletResponse response) - { - return ImplicitObjectUtil.getSharedFlow(request); + private static final Map<String, SharedFlowController> getSharedFlow(ServletRequest request, ServletResponse response) { + return ImplicitObjectUtil.getSharedFlow(request); } - private static final PageFlowController getPageFlow(ServletRequest request, ServletResponse response) - { + private static final PageFlowController getPageFlow(ServletRequest request, ServletResponse response) { return ImplicitObjectUtil.getPageFlow(request, response); } - private static final GlobalApp getGlobalApp(ServletRequest request, ServletResponse response) - { + private static final GlobalApp getGlobalApp(ServletRequest request, ServletResponse response) { return ImplicitObjectUtil.getGlobalApp(request, response); } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIVariableResolver.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIVariableResolver.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIVariableResolver.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIVariableResolver.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIVariableResolver.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIVariableResolver.java Wed Jan 19 11:00:31 2005 @@ -30,8 +30,8 @@ * */ public abstract class NetUIVariableResolver - implements VariableResolver -{ + implements VariableResolver { + public abstract Object resolveVariable(String name); public abstract String[] getAvailableVariables(); Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java Wed Jan 19 11:00:31 2005 @@ -24,8 +24,8 @@ /** * */ -public class ParsedExpression -{ +public class ParsedExpression { + private static Logger _logger = Logger.getInstance(ParsedExpression.class); /* cache the debug status; this needs to be _fast_ */ @@ -39,28 +39,22 @@ private ExpressionTerm atomicExpression = null; private Term[] termArray = null; private String exprStr; - - public void seal() - { + + public void seal() { termArray = new Term[terms.size()]; StringBuffer buf = new StringBuffer(); - for(int i = 0; i < terms.size(); i++) - { + for(int i = 0; i < terms.size(); i++) { Term t = (Term)terms.get(i); t.seal(); - if(t instanceof ExpressionTerm) - { - if(terms.size() == 1) - { + if(t instanceof ExpressionTerm) { + if(terms.size() == 1) { atomicExpression = (ExpressionTerm)terms.get(0); isExpression = true; } containsExpression = true; - } - else if(t instanceof LiteralTerm) - { + } else if(t instanceof LiteralTerm) { String lit = t.getExpressionString(); if(lit != null && lit.indexOf("{") > -1) containsExpression = true; @@ -72,74 +66,61 @@ exprStr = buf.toString(); } - public boolean isExpression() - { + public boolean isExpression() { return isExpression; } - public boolean containsExpression() - { + public boolean containsExpression() { return containsExpression; } - public void addTerm(Term term) - { + public void addTerm(Term term) { terms.add(term); } - public int getTokenCount() - { + public int getTokenCount() { return terms.size(); } - public Term getTerm(int i) - { + public Term getTerm(int i) { assert termArray != null; assert i > 0 && i < termArray.length; return termArray[i]; } - public ExpressionTerm getAtomicExpressionTerm() - { + public ExpressionTerm getAtomicExpressionTerm() { return atomicExpression; } - public Object evaluate(NetUIVariableResolver vr) - { + public Object evaluate(NetUIVariableResolver vr) { if(DEBUG_ENABLED) _logger.debug("evaluate expression: " + exprStr); - if(isExpression) - { + if(isExpression) { if(DEBUG_ENABLED) _logger.debug("atoimc expression"); return atomicExpression.evaluate(vr); - } - else - { + } else { StringBuffer buf = new StringBuffer(); - - for(int i = 0; i < terms.size(); i++) - { + + for(int i = 0; i < terms.size(); i++) { if(DEBUG_ENABLED) _logger.debug("term[" + i + "]: " + termArray[i].getClass().getName() + - " expression string: " + termArray[i].getExpressionString()); + " expression string: " + termArray[i].getExpressionString()); Object result = termArray[i].evaluate(vr); buf.append(result != null ? result.toString() : EMPTY_STRING); } - + return buf.toString(); } } - public void update(Object value, NetUIVariableResolver vr) - { - if(!isExpression) - { + public void update(Object value, NetUIVariableResolver vr) { + if(!isExpression) { String msg = "The expression can not be updated because it is not atomic."; if(_logger.isErrorEnabled()) _logger.error(msg); @@ -149,12 +130,10 @@ atomicExpression.update(value, vr); } - public String changeContext(String oldContext, String newContext, Object index) - { - if(!isExpression) - { + public String changeContext(String oldContext, String newContext, Object index) { + if(!isExpression) { String msg = "The expression can not change context because it is not atomic."; - + if(_logger.isErrorEnabled()) _logger.error(msg); @@ -164,23 +143,21 @@ return atomicExpression.changeContext(oldContext, newContext, index); } - public String qualify(String contextName) - { + public String qualify(String contextName) { /* todo: could check to see if first term is literal */ return "{" + contextName + "." + getExpressionString() + "}"; } // only call on atomic expressions - public String getExpressionString() - { + public String getExpressionString() { if(isExpression) return atomicExpression.getExpressionString(); - else return exprStr; + else + return exprStr; } - public String toString() - { + public String toString() { StringBuilder builder = new StringBuilder(); for(Term term : terms) builder.append(term.toString()); Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/Term.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/Term.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/Term.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/Term.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/Term.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/Term.java Wed Jan 19 11:00:31 2005 @@ -20,12 +20,12 @@ /** * */ -public interface Term -{ +public interface Term { + public Object evaluate(NetUIVariableResolver vr); public String getExpressionString(); - + public void seal(); } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParser.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParser.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParser.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParser.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParser.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParser.java Wed Jan 19 11:00:31 2005 @@ -23,431 +23,471 @@ import org.apache.beehive.netui.script.el.Term; import org.apache.beehive.netui.script.el.tokens.*; -public class NetUIELParser implements NetUIELParserConstants { +public class NetUIELParser + implements NetUIELParserConstants { + public static void main(String[] args) - throws Exception - { + throws Exception { NetUIELParser parser = new NetUIELParser(System.in); parser.parse(); } // 3. - final public ParsedExpression parse() throws ParseException { -Token t = null; -ParsedExpression pe = new ParsedExpression(); -Term term = null; - label_1: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case NON_EXPRESSION_TEXT: - case START_EXPRESSION: - case ESCAPED_START_EXPRESSION: - ; - break; - default: - jj_la1[0] = jj_gen; - break label_1; - } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case NON_EXPRESSION_TEXT: - term = parseLiteralTerm(); - pe.addTerm(term); - break; - case START_EXPRESSION: - jj_consume_token(START_EXPRESSION); - term = parseExpression(); - jj_consume_token(END_EXPRESSION); - pe.addTerm(term); - break; - case ESCAPED_START_EXPRESSION: - jj_consume_token(ESCAPED_START_EXPRESSION); - term = parseExpression(); - jj_consume_token(END_EXPRESSION); - pe.addTerm(new LiteralTerm("\\")); pe.addTerm(term); - break; - default: - jj_la1[1] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - } - jj_consume_token(0); -{if (true) return pe;} - throw new Error("Missing return statement in function"); - } - - final public LiteralTerm parseLiteralTerm() throws ParseException { -Token t = null; -LiteralTerm ls = null; - t = jj_consume_token(NON_EXPRESSION_TEXT); - ls = new LiteralTerm(t.image); {if (true) return ls;} - throw new Error("Missing return statement in function"); - } - - final public ExpressionTerm parseExpression() throws ParseException { -ExpressionTerm expr = new ExpressionTerm(); -ExpressionToken eTok = null; - eTok = Context(); -expr.addToken(eTok); - label_2: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case DOT: - case LBRACKET: - ; - break; - default: - jj_la1[2] = jj_gen; - break label_2; - } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case DOT: - jj_consume_token(DOT); - eTok = ExprIdentifier(); - break; - default: - jj_la1[3] = jj_gen; - if (jj_2_1(2)) { - eTok = MapKey(); - } else { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case LBRACKET: - eTok = ArrayIndex(); - break; - default: - jj_la1[4] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - } - } - { - expr.addToken(eTok); - } - } -expr.seal(); -{if (true) return expr;} - throw new Error("Missing return statement in function"); - } - - final public ExpressionToken Context() throws ParseException { -Token t = null; -ExpressionToken eTok = null; - t = jj_consume_token(IDENTIFIER); + final public ParsedExpression parse() throws ParseException { + Token t = null; + ParsedExpression pe = new ParsedExpression(); + Term term = null; + label_1: + while(true) { + switch((jj_ntk == -1) ? jj_ntk() : jj_ntk) { + case NON_EXPRESSION_TEXT: + case START_EXPRESSION: + case ESCAPED_START_EXPRESSION: + ; + break; + default: + jj_la1[0] = jj_gen; + break label_1; + } + switch((jj_ntk == -1) ? jj_ntk() : jj_ntk) { + case NON_EXPRESSION_TEXT: + term = parseLiteralTerm(); + pe.addTerm(term); + break; + case START_EXPRESSION: + jj_consume_token(START_EXPRESSION); + term = parseExpression(); + jj_consume_token(END_EXPRESSION); + pe.addTerm(term); + break; + case ESCAPED_START_EXPRESSION: + jj_consume_token(ESCAPED_START_EXPRESSION); + term = parseExpression(); + jj_consume_token(END_EXPRESSION); + pe.addTerm(new LiteralTerm("\\")); + pe.addTerm(term); + break; + default: + jj_la1[1] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } + jj_consume_token(0); + { + if(true) return pe; + } + throw new Error("Missing return statement in function"); + } + + final public LiteralTerm parseLiteralTerm() throws ParseException { + Token t = null; + LiteralTerm ls = null; + t = jj_consume_token(NON_EXPRESSION_TEXT); + ls = new LiteralTerm(t.image); + { + if(true) return ls; + } + throw new Error("Missing return statement in function"); + } + + final public ExpressionTerm parseExpression() throws ParseException { + ExpressionTerm expr = new ExpressionTerm(); + ExpressionToken eTok = null; + eTok = Context(); + expr.addToken(eTok); + label_2: + while(true) { + switch((jj_ntk == -1) ? jj_ntk() : jj_ntk) { + case DOT: + case LBRACKET: + ; + break; + default: + jj_la1[2] = jj_gen; + break label_2; + } + switch((jj_ntk == -1) ? jj_ntk() : jj_ntk) { + case DOT: + jj_consume_token(DOT); + eTok = ExprIdentifier(); + break; + default: + jj_la1[3] = jj_gen; + if(jj_2_1(2)) { + eTok = MapKey(); + } else { + switch((jj_ntk == -1) ? jj_ntk() : jj_ntk) { + case LBRACKET: + eTok = ArrayIndex(); + break; + default: + jj_la1[4] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } + } + { + expr.addToken(eTok); + } + } + expr.seal(); + { + if(true) return expr; + } + throw new Error("Missing return statement in function"); + } + + final public ExpressionToken Context() throws ParseException { + Token t = null; + ExpressionToken eTok = null; + t = jj_consume_token(IDENTIFIER); //System.out.println("** Parser found context: " + t.image); -eTok = new ContextToken(t.image); -{if (true) return eTok;} - throw new Error("Missing return statement in function"); - } - - final public ExpressionToken ExprIdentifier() throws ParseException { -Token t = null; -ExpressionToken eTok = null; - t = jj_consume_token(IDENTIFIER); + eTok = new ContextToken(t.image); + { + if(true) return eTok; + } + throw new Error("Missing return statement in function"); + } + + final public ExpressionToken ExprIdentifier() throws ParseException { + Token t = null; + ExpressionToken eTok = null; + t = jj_consume_token(IDENTIFIER); //System.out.println("** Parser found identifier: " + t.image); -eTok = new IdentifierToken(t.image); -{if (true) return eTok;} - throw new Error("Missing return statement in function"); - } + eTok = new IdentifierToken(t.image); + { + if(true) return eTok; + } + throw new Error("Missing return statement in function"); + } // handle text inside of map braces as ["..."] or ['...'] - final public ExpressionToken MapKey() throws ParseException { -Token t = null; -ExpressionToken eTok = null; - jj_consume_token(LBRACKET); - t = jj_consume_token(STRING_LITERAL); - jj_consume_token(RBRACKET); -eTok = new MapKeyToken(t.image); -{if (true) return eTok;} - throw new Error("Missing return statement in function"); - } - - final public ExpressionToken ArrayIndex() throws ParseException { -Token t = null; -ExpressionToken eTok = null; - jj_consume_token(LBRACKET); - t = jj_consume_token(INTEGER); - jj_consume_token(RBRACKET); + final public ExpressionToken MapKey() throws ParseException { + Token t = null; + ExpressionToken eTok = null; + jj_consume_token(LBRACKET); + t = jj_consume_token(STRING_LITERAL); + jj_consume_token(RBRACKET); + eTok = new MapKeyToken(t.image); + { + if(true) return eTok; + } + throw new Error("Missing return statement in function"); + } + + final public ExpressionToken ArrayIndex() throws ParseException { + Token t = null; + ExpressionToken eTok = null; + jj_consume_token(LBRACKET); + t = jj_consume_token(INTEGER); + jj_consume_token(RBRACKET); //System.out.println("** Parser found array index: " + t.image); -eTok = new ArrayIndexToken(t.image); -{if (true) return eTok;} - throw new Error("Missing return statement in function"); - } - - final private boolean jj_2_1(int xla) { - jj_la = xla; jj_lastpos = jj_scanpos = token; - boolean retval = !jj_3_1(); - jj_save(0, xla); - return retval; - } - - final private boolean jj_3_1() { - if (jj_3R_3()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - final private boolean jj_3R_3() { - if (jj_scan_token(LBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(STRING_LITERAL)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - public NetUIELParserTokenManager token_source; - SimpleCharStream jj_input_stream; - public Token token, jj_nt; - private int jj_ntk; - private Token jj_scanpos, jj_lastpos; - private int jj_la; - public boolean lookingAhead = false; - private boolean jj_semLA; - private int jj_gen; - final private int[] jj_la1 = new int[5]; - static private int[] jj_la1_0; - static { - jj_la1_0(); - } - private static void jj_la1_0() { - jj_la1_0 = new int[] {0xe,0xe,0x12000,0x2000,0x10000,}; - } - final private JJCalls[] jj_2_rtns = new JJCalls[1]; - private boolean jj_rescan = false; - private int jj_gc = 0; - - public NetUIELParser(java.io.InputStream stream) { - jj_input_stream = new SimpleCharStream(stream, 1, 1); - token_source = new NetUIELParserTokenManager(jj_input_stream); - token = new Token(); - jj_ntk = -1; - jj_gen = 0; - for (int i = 0; i < 5; i++) jj_la1[i] = -1; - for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); - } - - public void ReInit(java.io.InputStream stream) { - jj_input_stream.ReInit(stream, 1, 1); - token_source.ReInit(jj_input_stream); - token = new Token(); - jj_ntk = -1; - jj_gen = 0; - for (int i = 0; i < 5; i++) jj_la1[i] = -1; - for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); - } - - public NetUIELParser(java.io.Reader stream) { - jj_input_stream = new SimpleCharStream(stream, 1, 1); - token_source = new NetUIELParserTokenManager(jj_input_stream); - token = new Token(); - jj_ntk = -1; - jj_gen = 0; - for (int i = 0; i < 5; i++) jj_la1[i] = -1; - for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); - } - - public void ReInit(java.io.Reader stream) { - jj_input_stream.ReInit(stream, 1, 1); - token_source.ReInit(jj_input_stream); - token = new Token(); - jj_ntk = -1; - jj_gen = 0; - for (int i = 0; i < 5; i++) jj_la1[i] = -1; - for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); - } - - public NetUIELParser(NetUIELParserTokenManager tm) { - token_source = tm; - token = new Token(); - jj_ntk = -1; - jj_gen = 0; - for (int i = 0; i < 5; i++) jj_la1[i] = -1; - for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); - } - - public void ReInit(NetUIELParserTokenManager tm) { - token_source = tm; - token = new Token(); - jj_ntk = -1; - jj_gen = 0; - for (int i = 0; i < 5; i++) jj_la1[i] = -1; - for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); - } - - final private Token jj_consume_token(int kind) throws ParseException { - Token oldToken; - if ((oldToken = token).next != null) token = token.next; - else token = token.next = token_source.getNextToken(); - jj_ntk = -1; - if (token.kind == kind) { - jj_gen++; - if (++jj_gc > 100) { - jj_gc = 0; - for (int i = 0; i < jj_2_rtns.length; i++) { - JJCalls c = jj_2_rtns[i]; - while (c != null) { - if (c.gen < jj_gen) c.first = null; - c = c.next; - } - } - } - return token; - } - token = oldToken; - jj_kind = kind; - throw generateParseException(); - } - - final private boolean jj_scan_token(int kind) { - if (jj_scanpos == jj_lastpos) { - jj_la--; - if (jj_scanpos.next == null) { - jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken(); - } else { - jj_lastpos = jj_scanpos = jj_scanpos.next; - } - } else { - jj_scanpos = jj_scanpos.next; - } - if (jj_rescan) { - int i = 0; Token tok = token; - while (tok != null && tok != jj_scanpos) { i++; tok = tok.next; } - if (tok != null) jj_add_error_token(kind, i); - } - return (jj_scanpos.kind != kind); - } - - final public Token getNextToken() { - if (token.next != null) token = token.next; - else token = token.next = token_source.getNextToken(); - jj_ntk = -1; - jj_gen++; - return token; - } - - final public Token getToken(int index) { - Token t = lookingAhead ? jj_scanpos : token; - for (int i = 0; i < index; i++) { - if (t.next != null) t = t.next; - else t = t.next = token_source.getNextToken(); - } - return t; - } - - final private int jj_ntk() { - if ((jj_nt=token.next) == null) - return (jj_ntk = (token.next=token_source.getNextToken()).kind); - else - return (jj_ntk = jj_nt.kind); - } - - private java.util.Vector jj_expentries = new java.util.Vector(); - private int[] jj_expentry; - private int jj_kind = -1; - private int[] jj_lasttokens = new int[100]; - private int jj_endpos; - - private void jj_add_error_token(int kind, int pos) { - if (pos >= 100) return; - if (pos == jj_endpos + 1) { - jj_lasttokens[jj_endpos++] = kind; - } else if (jj_endpos != 0) { - jj_expentry = new int[jj_endpos]; - for (int i = 0; i < jj_endpos; i++) { - jj_expentry[i] = jj_lasttokens[i]; - } - boolean exists = false; - for (java.util.Enumeration e = jj_expentries.elements(); e.hasMoreElements();) { - int[] oldentry = (int[])(e.nextElement()); - if (oldentry.length == jj_expentry.length) { - exists = true; - for (int i = 0; i < jj_expentry.length; i++) { - if (oldentry[i] != jj_expentry[i]) { - exists = false; - break; - } - } - if (exists) break; - } - } - if (!exists) jj_expentries.addElement(jj_expentry); - if (pos != 0) jj_lasttokens[(jj_endpos = pos) - 1] = kind; - } - } - - public ParseException generateParseException() { - jj_expentries.removeAllElements(); - boolean[] la1tokens = new boolean[18]; - for (int i = 0; i < 18; i++) { - la1tokens[i] = false; - } - if (jj_kind >= 0) { - la1tokens[jj_kind] = true; - jj_kind = -1; - } - for (int i = 0; i < 5; i++) { - if (jj_la1[i] == jj_gen) { - for (int j = 0; j < 32; j++) { - if ((jj_la1_0[i] & (1<<j)) != 0) { - la1tokens[j] = true; - } - } - } - } - for (int i = 0; i < 18; i++) { - if (la1tokens[i]) { - jj_expentry = new int[1]; - jj_expentry[0] = i; - jj_expentries.addElement(jj_expentry); - } - } - jj_endpos = 0; - jj_rescan_token(); - jj_add_error_token(0, 0); - int[][] exptokseq = new int[jj_expentries.size()][]; - for (int i = 0; i < jj_expentries.size(); i++) { - exptokseq[i] = (int[])jj_expentries.elementAt(i); - } - return new ParseException(token, exptokseq, tokenImage); - } - - final public void enable_tracing() { - } - - final public void disable_tracing() { - } - - final private void jj_rescan_token() { - jj_rescan = true; - for (int i = 0; i < 1; i++) { - JJCalls p = jj_2_rtns[i]; - do { - if (p.gen > jj_gen) { - jj_la = p.arg; jj_lastpos = jj_scanpos = p.first; - switch (i) { - case 0: jj_3_1(); break; - } - } - p = p.next; - } while (p != null); - } - jj_rescan = false; - } - - final private void jj_save(int index, int xla) { - JJCalls p = jj_2_rtns[index]; - while (p.gen > jj_gen) { - if (p.next == null) { p = p.next = new JJCalls(); break; } - p = p.next; - } - p.gen = jj_gen + xla - jj_la; p.first = token; p.arg = xla; - } - - static final class JJCalls { - int gen; - Token first; - int arg; - JJCalls next; - } + eTok = new ArrayIndexToken(t.image); + { + if(true) return eTok; + } + throw new Error("Missing return statement in function"); + } + + final private boolean jj_2_1(int xla) { + jj_la = xla; + jj_lastpos = jj_scanpos = token; + boolean retval = !jj_3_1(); + jj_save(0, xla); + return retval; + } + + final private boolean jj_3_1() { + if(jj_3R_3()) return true; + if(jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + final private boolean jj_3R_3() { + if(jj_scan_token(LBRACKET)) return true; + if(jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if(jj_scan_token(STRING_LITERAL)) return true; + if(jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + public NetUIELParserTokenManager token_source; + SimpleCharStream jj_input_stream; + public Token token, jj_nt; + private int jj_ntk; + private Token jj_scanpos, jj_lastpos; + private int jj_la; + public boolean lookingAhead = false; + private boolean jj_semLA; + private int jj_gen; + final private int[] jj_la1 = new int[5]; + static private int[] jj_la1_0; + + static { + jj_la1_0(); + } + + private static void jj_la1_0() { + jj_la1_0 = new int[]{0xe, 0xe, 0x12000, 0x2000, 0x10000, }; + } + + final private JJCalls[] jj_2_rtns = new JJCalls[1]; + private boolean jj_rescan = false; + private int jj_gc = 0; + + public NetUIELParser(java.io.InputStream stream) { + jj_input_stream = new SimpleCharStream(stream, 1, 1); + token_source = new NetUIELParserTokenManager(jj_input_stream); + token = new Token(); + jj_ntk = -1; + jj_gen = 0; + for(int i = 0; i < 5; i++) jj_la1[i] = -1; + for(int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); + } + + public void ReInit(java.io.InputStream stream) { + jj_input_stream.ReInit(stream, 1, 1); + token_source.ReInit(jj_input_stream); + token = new Token(); + jj_ntk = -1; + jj_gen = 0; + for(int i = 0; i < 5; i++) jj_la1[i] = -1; + for(int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); + } + + public NetUIELParser(java.io.Reader stream) { + jj_input_stream = new SimpleCharStream(stream, 1, 1); + token_source = new NetUIELParserTokenManager(jj_input_stream); + token = new Token(); + jj_ntk = -1; + jj_gen = 0; + for(int i = 0; i < 5; i++) jj_la1[i] = -1; + for(int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); + } + + public void ReInit(java.io.Reader stream) { + jj_input_stream.ReInit(stream, 1, 1); + token_source.ReInit(jj_input_stream); + token = new Token(); + jj_ntk = -1; + jj_gen = 0; + for(int i = 0; i < 5; i++) jj_la1[i] = -1; + for(int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); + } + + public NetUIELParser(NetUIELParserTokenManager tm) { + token_source = tm; + token = new Token(); + jj_ntk = -1; + jj_gen = 0; + for(int i = 0; i < 5; i++) jj_la1[i] = -1; + for(int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); + } + + public void ReInit(NetUIELParserTokenManager tm) { + token_source = tm; + token = new Token(); + jj_ntk = -1; + jj_gen = 0; + for(int i = 0; i < 5; i++) jj_la1[i] = -1; + for(int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); + } + + final private Token jj_consume_token(int kind) throws ParseException { + Token oldToken; + if((oldToken = token).next != null) + token = token.next; + else + token = token.next = token_source.getNextToken(); + jj_ntk = -1; + if(token.kind == kind) { + jj_gen++; + if(++jj_gc > 100) { + jj_gc = 0; + for(int i = 0; i < jj_2_rtns.length; i++) { + JJCalls c = jj_2_rtns[i]; + while(c != null) { + if(c.gen < jj_gen) c.first = null; + c = c.next; + } + } + } + return token; + } + token = oldToken; + jj_kind = kind; + throw generateParseException(); + } + + final private boolean jj_scan_token(int kind) { + if(jj_scanpos == jj_lastpos) { + jj_la--; + if(jj_scanpos.next == null) { + jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken(); + } else { + jj_lastpos = jj_scanpos = jj_scanpos.next; + } + } else { + jj_scanpos = jj_scanpos.next; + } + if(jj_rescan) { + int i = 0; + Token tok = token; + while(tok != null && tok != jj_scanpos) { + i++; + tok = tok.next; + } + if(tok != null) jj_add_error_token(kind, i); + } + return (jj_scanpos.kind != kind); + } + + final public Token getNextToken() { + if(token.next != null) + token = token.next; + else + token = token.next = token_source.getNextToken(); + jj_ntk = -1; + jj_gen++; + return token; + } + + final public Token getToken(int index) { + Token t = lookingAhead ? jj_scanpos : token; + for(int i = 0; i < index; i++) { + if(t.next != null) + t = t.next; + else + t = t.next = token_source.getNextToken(); + } + return t; + } + + final private int jj_ntk() { + if((jj_nt = token.next) == null) + return (jj_ntk = (token.next = token_source.getNextToken()).kind); + else + return (jj_ntk = jj_nt.kind); + } + + private java.util.Vector jj_expentries = new java.util.Vector(); + private int[] jj_expentry; + private int jj_kind = -1; + private int[] jj_lasttokens = new int[100]; + private int jj_endpos; + + private void jj_add_error_token(int kind, int pos) { + if(pos >= 100) return; + if(pos == jj_endpos + 1) { + jj_lasttokens[jj_endpos++] = kind; + } else if(jj_endpos != 0) { + jj_expentry = new int[jj_endpos]; + for(int i = 0; i < jj_endpos; i++) { + jj_expentry[i] = jj_lasttokens[i]; + } + boolean exists = false; + for(java.util.Enumeration e = jj_expentries.elements(); e.hasMoreElements();) { + int[] oldentry = (int[])(e.nextElement()); + if(oldentry.length == jj_expentry.length) { + exists = true; + for(int i = 0; i < jj_expentry.length; i++) { + if(oldentry[i] != jj_expentry[i]) { + exists = false; + break; + } + } + if(exists) break; + } + } + if(!exists) jj_expentries.addElement(jj_expentry); + if(pos != 0) jj_lasttokens[(jj_endpos = pos) - 1] = kind; + } + } + + public ParseException generateParseException() { + jj_expentries.removeAllElements(); + boolean[] la1tokens = new boolean[18]; + for(int i = 0; i < 18; i++) { + la1tokens[i] = false; + } + if(jj_kind >= 0) { + la1tokens[jj_kind] = true; + jj_kind = -1; + } + for(int i = 0; i < 5; i++) { + if(jj_la1[i] == jj_gen) { + for(int j = 0; j < 32; j++) { + if((jj_la1_0[i] & (1 << j)) != 0) { + la1tokens[j] = true; + } + } + } + } + for(int i = 0; i < 18; i++) { + if(la1tokens[i]) { + jj_expentry = new int[1]; + jj_expentry[0] = i; + jj_expentries.addElement(jj_expentry); + } + } + jj_endpos = 0; + jj_rescan_token(); + jj_add_error_token(0, 0); + int[][] exptokseq = new int[jj_expentries.size()][]; + for(int i = 0; i < jj_expentries.size(); i++) { + exptokseq[i] = (int[])jj_expentries.elementAt(i); + } + return new ParseException(token, exptokseq, tokenImage); + } + + final public void enable_tracing() { + } + + final public void disable_tracing() { + } + + final private void jj_rescan_token() { + jj_rescan = true; + for(int i = 0; i < 1; i++) { + JJCalls p = jj_2_rtns[i]; + do { + if(p.gen > jj_gen) { + jj_la = p.arg; + jj_lastpos = jj_scanpos = p.first; + switch(i) { + case 0: + jj_3_1(); + break; + } + } + p = p.next; + } while(p != null); + } + jj_rescan = false; + } + + final private void jj_save(int index, int xla) { + JJCalls p = jj_2_rtns[index]; + while(p.gen > jj_gen) { + if(p.next == null) { + p = p.next = new JJCalls(); + break; + } + p = p.next; + } + p.gen = jj_gen + xla - jj_la; + p.first = token; + p.arg = xla; + } + + static final class JJCalls { + + int gen; + Token first; + int arg; + JJCalls next; + } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParserConstants.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParserConstants.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParserConstants.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParserConstants.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParserConstants.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParserConstants.java Wed Jan 19 11:00:31 2005 @@ -19,47 +19,47 @@ public interface NetUIELParserConstants { - int EOF = 0; - int NON_EXPRESSION_TEXT = 1; - int START_EXPRESSION = 2; - int ESCAPED_START_EXPRESSION = 3; - int END_EXPRESSION = 4; - int STRING_LITERAL = 5; - int ECMA_ESCAPE_SEQUENCE = 6; - int HIT = 7; - int IDENTIFIER = 8; - int IMPL_OBJ_START = 9; - int LETTER = 10; - int DIGIT = 11; - int INTEGER = 12; - int DOT = 13; - int DQUOTE = 14; - int SQUOTE = 15; - int LBRACKET = 16; - int RBRACKET = 17; + int EOF = 0; + int NON_EXPRESSION_TEXT = 1; + int START_EXPRESSION = 2; + int ESCAPED_START_EXPRESSION = 3; + int END_EXPRESSION = 4; + int STRING_LITERAL = 5; + int ECMA_ESCAPE_SEQUENCE = 6; + int HIT = 7; + int IDENTIFIER = 8; + int IMPL_OBJ_START = 9; + int LETTER = 10; + int DIGIT = 11; + int INTEGER = 12; + int DOT = 13; + int DQUOTE = 14; + int SQUOTE = 15; + int LBRACKET = 16; + int RBRACKET = 17; - int DEFAULT = 0; - int IN_EXPRESSION = 1; + int DEFAULT = 0; + int IN_EXPRESSION = 1; - String[] tokenImage = { - "<EOF>", - "<NON_EXPRESSION_TEXT>", - "\"{\"", - "\"\\\\\\\\{\"", - "\"}\"", - "<STRING_LITERAL>", - "<ECMA_ESCAPE_SEQUENCE>", - "<HIT>", - "<IDENTIFIER>", - "\"#\"", - "<LETTER>", - "<DIGIT>", - "<INTEGER>", - "\".\"", - "\"\\\"\"", - "\"\\\'\"", - "\"[\"", - "\"]\"", - }; + String[] tokenImage = { + "<EOF>", + "<NON_EXPRESSION_TEXT>", + "\"{\"", + "\"\\\\\\\\{\"", + "\"}\"", + "<STRING_LITERAL>", + "<ECMA_ESCAPE_SEQUENCE>", + "<HIT>", + "<IDENTIFIER>", + "\"#\"", + "<LETTER>", + "<DIGIT>", + "<INTEGER>", + "\".\"", + "\"\\\"\"", + "\"\\\'\"", + "\"[\"", + "\"]\"", + }; } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParserTokenManager.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParserTokenManager.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParserTokenManager.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParserTokenManager.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParserTokenManager.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParserTokenManager.java Wed Jan 19 11:00:31 2005 @@ -16,796 +16,771 @@ * $Header:$ */ package org.apache.beehive.netui.script.el.parser; + import org.apache.beehive.netui.script.el.ExpressionTerm; import org.apache.beehive.netui.script.el.LiteralTerm; import org.apache.beehive.netui.script.el.ParsedExpression; import org.apache.beehive.netui.script.el.Term; import org.apache.beehive.netui.script.el.tokens.*; -public class NetUIELParserTokenManager implements NetUIELParserConstants -{ - public java.io.PrintStream debugStream = System.out; - public void setDebugStream(java.io.PrintStream ds) { debugStream = ds; } -private final int jjStopStringLiteralDfa_0(int pos, long active0) -{ - switch (pos) - { - case 0: - if ((active0 & 0x8L) != 0L) - { - jjmatchedKind = 1; +public class NetUIELParserTokenManager + implements NetUIELParserConstants { + + public java.io.PrintStream debugStream = System.out; + + public void setDebugStream(java.io.PrintStream ds) { + debugStream = ds; + } + + private final int jjStopStringLiteralDfa_0(int pos, long active0) { + switch(pos) { + case 0: + if((active0 & 0x8L) != 0L) { + jjmatchedKind = 1; + return 1; + } + return -1; + case 1: + if((active0 & 0x8L) != 0L) { + if(jjmatchedPos == 0) { + jjmatchedKind = 1; + jjmatchedPos = 0; + } + return -1; + } + return -1; + default : + return -1; + } + } + + private final int jjStartNfa_0(int pos, long active0) { + return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1); + } + + private final int jjStopAtPos(int pos, int kind) { + jjmatchedKind = kind; + jjmatchedPos = pos; + return pos + 1; + } + + private final int jjStartNfaWithStates_0(int pos, int kind, int state) { + jjmatchedKind = kind; + jjmatchedPos = pos; + try { + curChar = input_stream.readChar(); + } catch(java.io.IOException e) { + return pos + 1; + } + return jjMoveNfa_0(state, pos + 1); + } + + private final int jjMoveStringLiteralDfa0_0() { + switch(curChar) { + case 92: + return jjMoveStringLiteralDfa1_0(0x8L); + case 123: + return jjStopAtPos(0, 2); + default : + return jjMoveNfa_0(2, 0); + } + } + + private final int jjMoveStringLiteralDfa1_0(long active0) { + try { + curChar = input_stream.readChar(); + } catch(java.io.IOException e) { + jjStopStringLiteralDfa_0(0, active0); return 1; - } - return -1; - case 1: - if ((active0 & 0x8L) != 0L) - { - if (jjmatchedPos == 0) - { - jjmatchedKind = 1; - jjmatchedPos = 0; - } - return -1; - } - return -1; - default : - return -1; - } -} -private final int jjStartNfa_0(int pos, long active0) -{ - return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1); -} -private final int jjStopAtPos(int pos, int kind) -{ - jjmatchedKind = kind; - jjmatchedPos = pos; - return pos + 1; -} -private final int jjStartNfaWithStates_0(int pos, int kind, int state) -{ - jjmatchedKind = kind; - jjmatchedPos = pos; - try { curChar = input_stream.readChar(); } - catch(java.io.IOException e) { return pos + 1; } - return jjMoveNfa_0(state, pos + 1); -} -private final int jjMoveStringLiteralDfa0_0() -{ - switch(curChar) - { - case 92: - return jjMoveStringLiteralDfa1_0(0x8L); - case 123: - return jjStopAtPos(0, 2); - default : - return jjMoveNfa_0(2, 0); - } -} -private final int jjMoveStringLiteralDfa1_0(long active0) -{ - try { curChar = input_stream.readChar(); } - catch(java.io.IOException e) { - jjStopStringLiteralDfa_0(0, active0); - return 1; - } - switch(curChar) - { - case 92: - return jjMoveStringLiteralDfa2_0(active0, 0x8L); - default : - break; - } - return jjStartNfa_0(0, active0); -} -private final int jjMoveStringLiteralDfa2_0(long old0, long active0) -{ - if (((active0 &= old0)) == 0L) - return jjStartNfa_0(0, old0); - try { curChar = input_stream.readChar(); } - catch(java.io.IOException e) { - jjStopStringLiteralDfa_0(1, active0); - return 2; - } - switch(curChar) - { - case 123: - if ((active0 & 0x8L) != 0L) - return jjStopAtPos(2, 3); - break; - default : - break; - } - return jjStartNfa_0(1, active0); -} -private final void jjCheckNAdd(int state) -{ - if (jjrounds[state] != jjround) - { - jjstateSet[jjnewStateCnt++] = state; - jjrounds[state] = jjround; - } -} -private final void jjAddStates(int start, int end) -{ - do { - jjstateSet[jjnewStateCnt++] = jjnextStates[start]; - } while (start++ != end); -} -private final void jjCheckNAddTwoStates(int state1, int state2) -{ - jjCheckNAdd(state1); - jjCheckNAdd(state2); -} -private final void jjCheckNAddStates(int start, int end) -{ - do { - jjCheckNAdd(jjnextStates[start]); - } while (start++ != end); -} -private final void jjCheckNAddStates(int start) -{ - jjCheckNAdd(jjnextStates[start]); - jjCheckNAdd(jjnextStates[start + 1]); -} -static final long[] jjbitVec0 = { - 0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL -}; -static final long[] jjbitVec2 = { - 0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL -}; -private final int jjMoveNfa_0(int startState, int curPos) -{ - int[] nextStates; - int startsAt = 0; - jjnewStateCnt = 4; - int i = 1; - jjstateSet[0] = startState; - int j, kind = 0x7fffffff; - for (;;) - { - if (++jjround == 0x7fffffff) - ReInitRounds(); - if (curChar < 64) - { - long l = 1L << curChar; - MatchLoop: do - { - switch(jjstateSet[--i]) - { - case 2: - case 0: - kind = 1; - jjCheckNAdd(0); - break; - default : break; - } - } while(i != startsAt); - } - else if (curChar < 128) - { - long l = 1L << (curChar & 077); - MatchLoop: do - { - switch(jjstateSet[--i]) - { - case 2: - if ((0xf7ffffffefffffffL & l) != 0L) - { - if (kind > 1) - kind = 1; - jjCheckNAdd(0); - } - else if (curChar == 92) - { - if (kind > 1) - kind = 1; - } - if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 1; - break; - case 0: - if ((0xf7ffffffefffffffL & l) == 0L) - break; - kind = 1; - jjCheckNAdd(0); - break; - case 1: - if (curChar == 123) - kind = 1; - break; - case 3: - if (curChar == 92 && kind > 1) - kind = 1; - break; - default : break; - } - } while(i != startsAt); - } - else - { - int hiByte = (int)(curChar >> 8); - int i1 = hiByte >> 6; - long l1 = 1L << (hiByte & 077); - int i2 = (curChar & 0xff) >> 6; - long l2 = 1L << (curChar & 077); - MatchLoop: do - { - switch(jjstateSet[--i]) - { - case 2: - case 0: - if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) - break; - if (kind > 1) - kind = 1; - jjCheckNAdd(0); - break; - default : break; - } - } while(i != startsAt); - } - if (kind != 0x7fffffff) - { - jjmatchedKind = kind; - jjmatchedPos = curPos; - kind = 0x7fffffff; - } - ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 4 - (jjnewStateCnt = startsAt))) - return curPos; - try { curChar = input_stream.readChar(); } - catch(java.io.IOException e) { return curPos; } - } -} -private final int jjStopStringLiteralDfa_1(int pos, long active0) -{ - switch (pos) - { - default : - return -1; - } -} -private final int jjStartNfa_1(int pos, long active0) -{ - return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0), pos + 1); -} -private final int jjStartNfaWithStates_1(int pos, int kind, int state) -{ - jjmatchedKind = kind; - jjmatchedPos = pos; - try { curChar = input_stream.readChar(); } - catch(java.io.IOException e) { return pos + 1; } - return jjMoveNfa_1(state, pos + 1); -} -private final int jjMoveStringLiteralDfa0_1() -{ - switch(curChar) - { - case 34: - return jjStartNfaWithStates_1(0, 14, 33); - case 39: - return jjStartNfaWithStates_1(0, 15, 34); - case 46: - return jjStopAtPos(0, 13); - case 91: - return jjStopAtPos(0, 16); - case 93: - return jjStopAtPos(0, 17); - case 125: - return jjStopAtPos(0, 4); - default : - return jjMoveNfa_1(0, 0); - } -} -static final long[] jjbitVec3 = { - 0x1ff00000fffffffeL, 0xffffffffffffc000L, 0xffffffffL, 0x600000000000000L -}; -static final long[] jjbitVec4 = { - 0x0L, 0x0L, 0x0L, 0xff7fffffff7fffffL -}; -static final long[] jjbitVec5 = { - 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL -}; -static final long[] jjbitVec6 = { - 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffL, 0x0L -}; -static final long[] jjbitVec7 = { - 0xffffffffffffffffL, 0xffffffffffffffffL, 0x0L, 0x0L -}; -static final long[] jjbitVec8 = { - 0x3fffffffffffL, 0x0L, 0x0L, 0x0L -}; -private final int jjMoveNfa_1(int startState, int curPos) -{ - int[] nextStates; - int startsAt = 0; - jjnewStateCnt = 33; - int i = 1; - jjstateSet[0] = startState; - int j, kind = 0x7fffffff; - for (;;) - { - if (++jjround == 0x7fffffff) - ReInitRounds(); - if (curChar < 64) - { - long l = 1L << curChar; - MatchLoop: do - { - switch(jjstateSet[--i]) - { - case 33: - if ((0xffffffffffffdbffL & l) != 0L) - jjCheckNAddStates(0, 5); - if ((0xff000000000000L & l) != 0L) - jjCheckNAddStates(6, 11); - else if (curChar == 34) - { - if (kind > 5) - kind = 5; - } - if ((0xf000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 10; - break; - case 34: - if ((0xffffffffffffdbffL & l) != 0L) - jjCheckNAddStates(12, 17); - if ((0xff000000000000L & l) != 0L) - jjCheckNAddStates(18, 23); - else if (curChar == 39) - { - if (kind > 5) - kind = 5; - } - if ((0xf000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 25; - break; - case 0: - if ((0x3ff000000000000L & l) != 0L) - { - if (kind > 12) - kind = 12; - jjCheckNAdd(32); - } - else if ((0x1800000000L & l) != 0L) - { - if (kind > 8) - kind = 8; - jjCheckNAdd(31); - } - else if (curChar == 39) - jjCheckNAddStates(12, 17); - else if (curChar == 34) - jjCheckNAddStates(0, 5); - break; - case 1: - if ((0xffffffffffffdbffL & l) != 0L) - jjCheckNAddStates(0, 5); - break; - case 3: - if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 4; - break; - case 4: - if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 5; - break; - case 5: - case 8: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAdd(6); - break; - case 6: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(0, 5); - break; - case 9: - if ((0xf000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 10; - break; - case 10: - if ((0xff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 11; - break; - case 11: - if ((0xff000000000000L & l) != 0L) - jjCheckNAddStates(0, 5); - break; - case 12: - if ((0xff000000000000L & l) != 0L) - jjCheckNAddStates(6, 11); - break; - case 13: - if (curChar == 34 && kind > 5) - kind = 5; - break; - case 14: - if ((0xff000000000000L & l) != 0L) - jjCheckNAddStates(24, 30); - break; - case 15: - if (curChar == 39) - jjCheckNAddStates(12, 17); - break; - case 16: - if ((0xffffffffffffdbffL & l) != 0L) - jjCheckNAddStates(12, 17); - break; - case 18: - if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 19; - break; - case 19: - if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 20; - break; - case 20: - case 23: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAdd(21); - break; - case 21: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(12, 17); - break; - case 24: - if ((0xf000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 25; - break; - case 25: - if ((0xff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 26; - break; - case 26: - if ((0xff000000000000L & l) != 0L) - jjCheckNAddStates(12, 17); - break; - case 27: - if ((0xff000000000000L & l) != 0L) - jjCheckNAddStates(18, 23); - break; - case 28: - if (curChar == 39 && kind > 5) - kind = 5; - break; - case 29: - if ((0xff000000000000L & l) != 0L) - jjCheckNAddStates(31, 37); - break; - case 30: - if ((0x1800000000L & l) == 0L) - break; - if (kind > 8) - kind = 8; - jjCheckNAdd(31); - break; - case 31: - if ((0x3ff001000000000L & l) == 0L) - break; - if (kind > 8) - kind = 8; - jjCheckNAdd(31); - break; - case 32: - if ((0x3ff000000000000L & l) == 0L) - break; - if (kind > 12) - kind = 12; - jjCheckNAdd(32); - break; - default : break; - } - } while(i != startsAt); - } - else if (curChar < 128) - { - long l = 1L << (curChar & 077); - MatchLoop: do - { - switch(jjstateSet[--i]) - { - case 33: - jjCheckNAddStates(0, 5); - if ((0x100000001000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 8; - else if ((0x20000000200000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 3; - break; - case 34: - jjCheckNAddStates(12, 17); - if ((0x100000001000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 23; - else if ((0x20000000200000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 18; - break; - case 0: - case 31: - if ((0x7fffffe87fffffeL & l) == 0L) - break; - if (kind > 8) - kind = 8; - jjCheckNAdd(31); - break; - case 1: - jjCheckNAddStates(0, 5); - break; - case 2: - if ((0x20000000200000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 3; - break; - case 3: - if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 4; - break; - case 4: - if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 5; - break; - case 5: - case 8: - if ((0x7e0000007eL & l) != 0L) - jjCheckNAdd(6); - break; - case 6: - if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(0, 5); - break; - case 7: - if ((0x100000001000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 8; - break; - case 16: - jjCheckNAddStates(12, 17); - break; - case 17: - if ((0x20000000200000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 18; - break; - case 18: - if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 19; - break; - case 19: - if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 20; - break; - case 20: - case 23: - if ((0x7e0000007eL & l) != 0L) - jjCheckNAdd(21); - break; - case 21: - if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(12, 17); - break; - case 22: - if ((0x100000001000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 23; - break; - default : break; - } - } while(i != startsAt); - } - else - { - int hiByte = (int)(curChar >> 8); - int i1 = hiByte >> 6; - long l1 = 1L << (hiByte & 077); - int i2 = (curChar & 0xff) >> 6; - long l2 = 1L << (curChar & 077); - MatchLoop: do - { - switch(jjstateSet[--i]) - { - case 33: - case 1: - if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(0, 5); - break; - case 34: - case 16: - if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - jjCheckNAddStates(12, 17); - break; - case 0: - case 31: - if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) - break; - if (kind > 8) - kind = 8; - jjCheckNAdd(31); - break; - default : break; - } - } while(i != startsAt); - } - if (kind != 0x7fffffff) - { - jjmatchedKind = kind; - jjmatchedPos = curPos; - kind = 0x7fffffff; - } - ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 33 - (jjnewStateCnt = startsAt))) - return curPos; - try { curChar = input_stream.readChar(); } - catch(java.io.IOException e) { return curPos; } - } -} -static final int[] jjnextStates = { - 1, 2, 7, 9, 12, 13, 1, 2, 7, 9, 13, 14, 16, 17, 22, 24, - 27, 28, 16, 17, 22, 24, 28, 29, 1, 2, 7, 9, 12, 13, 14, 16, - 17, 22, 24, 27, 28, 29, -}; -private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2) -{ - switch(hiByte) - { - case 0: - return ((jjbitVec2[i2] & l2) != 0L); - default : - if ((jjbitVec0[i1] & l1) != 0L) - return true; - return false; - } -} -private static final boolean jjCanMove_1(int hiByte, int i1, int i2, long l1, long l2) -{ - switch(hiByte) - { - case 0: - return ((jjbitVec4[i2] & l2) != 0L); - case 48: - return ((jjbitVec5[i2] & l2) != 0L); - case 49: - return ((jjbitVec6[i2] & l2) != 0L); - case 51: - return ((jjbitVec7[i2] & l2) != 0L); - case 61: - return ((jjbitVec8[i2] & l2) != 0L); - default : - if ((jjbitVec3[i1] & l1) != 0L) - return true; - return false; - } -} -public static final String[] jjstrLiteralImages = { -"", null, "\173", "\134\134\173", "\175", null, null, null, null, null, null, -null, null, "\56", "\42", "\47", "\133", "\135", }; -public static final String[] lexStateNames = { - "DEFAULT", - "IN_EXPRESSION", -}; -public static final int[] jjnewLexState = { - -1, -1, 1, 1, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -}; -protected SimpleCharStream input_stream; -private final int[] jjrounds = new int[33]; -private final int[] jjstateSet = new int[66]; -protected char curChar; -public NetUIELParserTokenManager(SimpleCharStream stream) -{ - if (SimpleCharStream.staticFlag) - throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer."); - input_stream = stream; -} -public NetUIELParserTokenManager(SimpleCharStream stream, int lexState) -{ - this(stream); - SwitchTo(lexState); -} -public void ReInit(SimpleCharStream stream) -{ - jjmatchedPos = jjnewStateCnt = 0; - curLexState = defaultLexState; - input_stream = stream; - ReInitRounds(); -} -private final void ReInitRounds() -{ - int i; - jjround = 0x80000001; - for (i = 33; i-- > 0;) - jjrounds[i] = 0x80000000; -} -public void ReInit(SimpleCharStream stream, int lexState) -{ - ReInit(stream); - SwitchTo(lexState); -} -public void SwitchTo(int lexState) -{ - if (lexState >= 2 || lexState < 0) - throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE); - else - curLexState = lexState; -} - -protected Token jjFillToken() -{ - Token t = Token.newToken(jjmatchedKind); - t.kind = jjmatchedKind; - String im = jjstrLiteralImages[jjmatchedKind]; - t.image = (im == null) ? input_stream.GetImage() : im; - t.beginLine = input_stream.getBeginLine(); - t.beginColumn = input_stream.getBeginColumn(); - t.endLine = input_stream.getEndLine(); - t.endColumn = input_stream.getEndColumn(); - return t; -} - -int curLexState = 0; -int defaultLexState = 0; -int jjnewStateCnt; -int jjround; -int jjmatchedPos; -int jjmatchedKind; - -public Token getNextToken() -{ - int kind; - Token specialToken = null; - Token matchedToken; - int curPos = 0; - - EOFLoop : - for (;;) - { - try - { - curChar = input_stream.BeginToken(); - } - catch(java.io.IOException e) - { - jjmatchedKind = 0; - matchedToken = jjFillToken(); - return matchedToken; - } - - switch(curLexState) - { - case 0: - jjmatchedKind = 0x7fffffff; - jjmatchedPos = 0; - curPos = jjMoveStringLiteralDfa0_0(); - break; - case 1: - jjmatchedKind = 0x7fffffff; - jjmatchedPos = 0; - curPos = jjMoveStringLiteralDfa0_1(); - break; - } - if (jjmatchedKind != 0x7fffffff) - { - if (jjmatchedPos + 1 < curPos) - input_stream.backup(curPos - jjmatchedPos - 1); - matchedToken = jjFillToken(); - if (jjnewLexState[jjmatchedKind] != -1) - curLexState = jjnewLexState[jjmatchedKind]; - return matchedToken; - } - int error_line = input_stream.getEndLine(); - int error_column = input_stream.getEndColumn(); - String error_after = null; - boolean EOFSeen = false; - try { input_stream.readChar(); input_stream.backup(1); } - catch (java.io.IOException e1) { - EOFSeen = true; - error_after = curPos <= 1 ? "" : input_stream.GetImage(); - if (curChar == '\n' || curChar == '\r') { - error_line++; - error_column = 0; } + switch(curChar) { + case 92: + return jjMoveStringLiteralDfa2_0(active0, 0x8L); + default : + break; + } + return jjStartNfa_0(0, active0); + } + + private final int jjMoveStringLiteralDfa2_0(long old0, long active0) { + if(((active0 &= old0)) == 0L) + return jjStartNfa_0(0, old0); + try { + curChar = input_stream.readChar(); + } catch(java.io.IOException e) { + jjStopStringLiteralDfa_0(1, active0); + return 2; + } + switch(curChar) { + case 123: + if((active0 & 0x8L) != 0L) + return jjStopAtPos(2, 3); + break; + default : + break; + } + return jjStartNfa_0(1, active0); + } + + private final void jjCheckNAdd(int state) { + if(jjrounds[state] != jjround) { + jjstateSet[jjnewStateCnt++] = state; + jjrounds[state] = jjround; + } + } + + private final void jjAddStates(int start, int end) { + do { + jjstateSet[jjnewStateCnt++] = jjnextStates[start]; + } while(start++ != end); + } + + private final void jjCheckNAddTwoStates(int state1, int state2) { + jjCheckNAdd(state1); + jjCheckNAdd(state2); + } + + private final void jjCheckNAddStates(int start, int end) { + do { + jjCheckNAdd(jjnextStates[start]); + } while(start++ != end); + } + + private final void jjCheckNAddStates(int start) { + jjCheckNAdd(jjnextStates[start]); + jjCheckNAdd(jjnextStates[start + 1]); + } + + static final long[] jjbitVec0 = { + 0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL + }; + static final long[] jjbitVec2 = { + 0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL + }; + + private final int jjMoveNfa_0(int startState, int curPos) { + int[] nextStates; + int startsAt = 0; + jjnewStateCnt = 4; + int i = 1; + jjstateSet[0] = startState; + int j, kind = 0x7fffffff; + for(; ;) { + if(++jjround == 0x7fffffff) + ReInitRounds(); + if(curChar < 64) { + long l = 1L << curChar; + MatchLoop: do { + switch(jjstateSet[--i]) { + case 2: + case 0: + kind = 1; + jjCheckNAdd(0); + break; + default : + break; + } + } while(i != startsAt); + } else if(curChar < 128) { + long l = 1L << (curChar & 077); + MatchLoop: do { + switch(jjstateSet[--i]) { + case 2: + if((0xf7ffffffefffffffL & l) != 0L) { + if(kind > 1) + kind = 1; + jjCheckNAdd(0); + } else if(curChar == 92) { + if(kind > 1) + kind = 1; + } + if(curChar == 92) + jjstateSet[jjnewStateCnt++] = 1; + break; + case 0: + if((0xf7ffffffefffffffL & l) == 0L) + break; + kind = 1; + jjCheckNAdd(0); + break; + case 1: + if(curChar == 123) + kind = 1; + break; + case 3: + if(curChar == 92 && kind > 1) + kind = 1; + break; + default : + break; + } + } while(i != startsAt); + } else { + int hiByte = (int)(curChar >> 8); + int i1 = hiByte >> 6; + long l1 = 1L << (hiByte & 077); + int i2 = (curChar & 0xff) >> 6; + long l2 = 1L << (curChar & 077); + MatchLoop: do { + switch(jjstateSet[--i]) { + case 2: + case 0: + if(!jjCanMove_0(hiByte, i1, i2, l1, l2)) + break; + if(kind > 1) + kind = 1; + jjCheckNAdd(0); + break; + default : + break; + } + } while(i != startsAt); + } + if(kind != 0x7fffffff) { + jjmatchedKind = kind; + jjmatchedPos = curPos; + kind = 0x7fffffff; + } + ++curPos; + if((i = jjnewStateCnt) == (startsAt = 4 - (jjnewStateCnt = startsAt))) + return curPos; + try { + curChar = input_stream.readChar(); + } catch(java.io.IOException e) { + return curPos; + } + } + } + + private final int jjStopStringLiteralDfa_1(int pos, long active0) { + switch(pos) { + default : + return -1; + } + } + + private final int jjStartNfa_1(int pos, long active0) { + return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0), pos + 1); + } + + private final int jjStartNfaWithStates_1(int pos, int kind, int state) { + jjmatchedKind = kind; + jjmatchedPos = pos; + try { + curChar = input_stream.readChar(); + } catch(java.io.IOException e) { + return pos + 1; + } + return jjMoveNfa_1(state, pos + 1); + } + + private final int jjMoveStringLiteralDfa0_1() { + switch(curChar) { + case 34: + return jjStartNfaWithStates_1(0, 14, 33); + case 39: + return jjStartNfaWithStates_1(0, 15, 34); + case 46: + return jjStopAtPos(0, 13); + case 91: + return jjStopAtPos(0, 16); + case 93: + return jjStopAtPos(0, 17); + case 125: + return jjStopAtPos(0, 4); + default : + return jjMoveNfa_1(0, 0); + } + } + + static final long[] jjbitVec3 = { + 0x1ff00000fffffffeL, 0xffffffffffffc000L, 0xffffffffL, 0x600000000000000L + }; + static final long[] jjbitVec4 = { + 0x0L, 0x0L, 0x0L, 0xff7fffffff7fffffL + }; + static final long[] jjbitVec5 = { + 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL + }; + static final long[] jjbitVec6 = { + 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffL, 0x0L + }; + static final long[] jjbitVec7 = { + 0xffffffffffffffffL, 0xffffffffffffffffL, 0x0L, 0x0L + }; + static final long[] jjbitVec8 = { + 0x3fffffffffffL, 0x0L, 0x0L, 0x0L + }; + + private final int jjMoveNfa_1(int startState, int curPos) { + int[] nextStates; + int startsAt = 0; + jjnewStateCnt = 33; + int i = 1; + jjstateSet[0] = startState; + int j, kind = 0x7fffffff; + for(; ;) { + if(++jjround == 0x7fffffff) + ReInitRounds(); + if(curChar < 64) { + long l = 1L << curChar; + MatchLoop: do { + switch(jjstateSet[--i]) { + case 33: + if((0xffffffffffffdbffL & l) != 0L) + jjCheckNAddStates(0, 5); + if((0xff000000000000L & l) != 0L) + jjCheckNAddStates(6, 11); + else if(curChar == 34) { + if(kind > 5) + kind = 5; + } + if((0xf000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 10; + break; + case 34: + if((0xffffffffffffdbffL & l) != 0L) + jjCheckNAddStates(12, 17); + if((0xff000000000000L & l) != 0L) + jjCheckNAddStates(18, 23); + else if(curChar == 39) { + if(kind > 5) + kind = 5; + } + if((0xf000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 25; + break; + case 0: + if((0x3ff000000000000L & l) != 0L) { + if(kind > 12) + kind = 12; + jjCheckNAdd(32); + } else if((0x1800000000L & l) != 0L) { + if(kind > 8) + kind = 8; + jjCheckNAdd(31); + } else if(curChar == 39) + jjCheckNAddStates(12, 17); + else if(curChar == 34) + jjCheckNAddStates(0, 5); + break; + case 1: + if((0xffffffffffffdbffL & l) != 0L) + jjCheckNAddStates(0, 5); + break; + case 3: + if((0x3ff000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 4; + break; + case 4: + if((0x3ff000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 5; + break; + case 5: + case 8: + if((0x3ff000000000000L & l) != 0L) + jjCheckNAdd(6); + break; + case 6: + if((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(0, 5); + break; + case 9: + if((0xf000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 10; + break; + case 10: + if((0xff000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 11; + break; + case 11: + if((0xff000000000000L & l) != 0L) + jjCheckNAddStates(0, 5); + break; + case 12: + if((0xff000000000000L & l) != 0L) + jjCheckNAddStates(6, 11); + break; + case 13: + if(curChar == 34 && kind > 5) + kind = 5; + break; + case 14: + if((0xff000000000000L & l) != 0L) + jjCheckNAddStates(24, 30); + break; + case 15: + if(curChar == 39) + jjCheckNAddStates(12, 17); + break; + case 16: + if((0xffffffffffffdbffL & l) != 0L) + jjCheckNAddStates(12, 17); + break; + case 18: + if((0x3ff000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 19; + break; + case 19: + if((0x3ff000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 20; + break; + case 20: + case 23: + if((0x3ff000000000000L & l) != 0L) + jjCheckNAdd(21); + break; + case 21: + if((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(12, 17); + break; + case 24: + if((0xf000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 25; + break; + case 25: + if((0xff000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 26; + break; + case 26: + if((0xff000000000000L & l) != 0L) + jjCheckNAddStates(12, 17); + break; + case 27: + if((0xff000000000000L & l) != 0L) + jjCheckNAddStates(18, 23); + break; + case 28: + if(curChar == 39 && kind > 5) + kind = 5; + break; + case 29: + if((0xff000000000000L & l) != 0L) + jjCheckNAddStates(31, 37); + break; + case 30: + if((0x1800000000L & l) == 0L) + break; + if(kind > 8) + kind = 8; + jjCheckNAdd(31); + break; + case 31: + if((0x3ff001000000000L & l) == 0L) + break; + if(kind > 8) + kind = 8; + jjCheckNAdd(31); + break; + case 32: + if((0x3ff000000000000L & l) == 0L) + break; + if(kind > 12) + kind = 12; + jjCheckNAdd(32); + break; + default : + break; + } + } while(i != startsAt); + } else if(curChar < 128) { + long l = 1L << (curChar & 077); + MatchLoop: do { + switch(jjstateSet[--i]) { + case 33: + jjCheckNAddStates(0, 5); + if((0x100000001000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 8; + else if((0x20000000200000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 3; + break; + case 34: + jjCheckNAddStates(12, 17); + if((0x100000001000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 23; + else if((0x20000000200000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 18; + break; + case 0: + case 31: + if((0x7fffffe87fffffeL & l) == 0L) + break; + if(kind > 8) + kind = 8; + jjCheckNAdd(31); + break; + case 1: + jjCheckNAddStates(0, 5); + break; + case 2: + if((0x20000000200000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 3; + break; + case 3: + if((0x7e0000007eL & l) != 0L) + jjstateSet[jjnewStateCnt++] = 4; + break; + case 4: + if((0x7e0000007eL & l) != 0L) + jjstateSet[jjnewStateCnt++] = 5; + break; + case 5: + case 8: + if((0x7e0000007eL & l) != 0L) + jjCheckNAdd(6); + break; + case 6: + if((0x7e0000007eL & l) != 0L) + jjCheckNAddStates(0, 5); + break; + case 7: + if((0x100000001000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 8; + break; + case 16: + jjCheckNAddStates(12, 17); + break; + case 17: + if((0x20000000200000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 18; + break; + case 18: + if((0x7e0000007eL & l) != 0L) + jjstateSet[jjnewStateCnt++] = 19; + break; + case 19: + if((0x7e0000007eL & l) != 0L) + jjstateSet[jjnewStateCnt++] = 20; + break; + case 20: + case 23: + if((0x7e0000007eL & l) != 0L) + jjCheckNAdd(21); + break; + case 21: + if((0x7e0000007eL & l) != 0L) + jjCheckNAddStates(12, 17); + break; + case 22: + if((0x100000001000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 23; + break; + default : + break; + } + } while(i != startsAt); + } else { + int hiByte = (int)(curChar >> 8); + int i1 = hiByte >> 6; + long l1 = 1L << (hiByte & 077); + int i2 = (curChar & 0xff) >> 6; + long l2 = 1L << (curChar & 077); + MatchLoop: do { + switch(jjstateSet[--i]) { + case 33: + case 1: + if(jjCanMove_0(hiByte, i1, i2, l1, l2)) + jjCheckNAddStates(0, 5); + break; + case 34: + case 16: + if(jjCanMove_0(hiByte, i1, i2, l1, l2)) + jjCheckNAddStates(12, 17); + break; + case 0: + case 31: + if(!jjCanMove_1(hiByte, i1, i2, l1, l2)) + break; + if(kind > 8) + kind = 8; + jjCheckNAdd(31); + break; + default : + break; + } + } while(i != startsAt); + } + if(kind != 0x7fffffff) { + jjmatchedKind = kind; + jjmatchedPos = curPos; + kind = 0x7fffffff; + } + ++curPos; + if((i = jjnewStateCnt) == (startsAt = 33 - (jjnewStateCnt = startsAt))) + return curPos; + try { + curChar = input_stream.readChar(); + } catch(java.io.IOException e) { + return curPos; + } + } + } + + static final int[] jjnextStates = { + 1, 2, 7, 9, 12, 13, 1, 2, 7, 9, 13, 14, 16, 17, 22, 24, + 27, 28, 16, 17, 22, 24, 28, 29, 1, 2, 7, 9, 12, 13, 14, 16, + 17, 22, 24, 27, 28, 29, + }; + + private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2) { + switch(hiByte) { + case 0: + return ((jjbitVec2[i2] & l2) != 0L); + default : + if((jjbitVec0[i1] & l1) != 0L) + return true; + return false; + } + } + + private static final boolean jjCanMove_1(int hiByte, int i1, int i2, long l1, long l2) { + switch(hiByte) { + case 0: + return ((jjbitVec4[i2] & l2) != 0L); + case 48: + return ((jjbitVec5[i2] & l2) != 0L); + case 49: + return ((jjbitVec6[i2] & l2) != 0L); + case 51: + return ((jjbitVec7[i2] & l2) != 0L); + case 61: + return ((jjbitVec8[i2] & l2) != 0L); + default : + if((jjbitVec3[i1] & l1) != 0L) + return true; + return false; + } + } + + public static final String[] jjstrLiteralImages = { + "", null, "\173", "\134\134\173", "\175", null, null, null, null, null, null, + null, null, "\56", "\42", "\47", "\133", "\135", }; + public static final String[] lexStateNames = { + "DEFAULT", + "IN_EXPRESSION", + }; + public static final int[] jjnewLexState = { + -1, -1, 1, 1, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + }; + protected SimpleCharStream input_stream; + private final int[] jjrounds = new int[33]; + private final int[] jjstateSet = new int[66]; + protected char curChar; + + public NetUIELParserTokenManager(SimpleCharStream stream) { + if(SimpleCharStream.staticFlag) + throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer."); + input_stream = stream; + } + + public NetUIELParserTokenManager(SimpleCharStream stream, int lexState) { + this(stream); + SwitchTo(lexState); + } + + public void ReInit(SimpleCharStream stream) { + jjmatchedPos = jjnewStateCnt = 0; + curLexState = defaultLexState; + input_stream = stream; + ReInitRounds(); + } + + private final void ReInitRounds() { + int i; + jjround = 0x80000001; + for(i = 33; i-- > 0;) + jjrounds[i] = 0x80000000; + } + + public void ReInit(SimpleCharStream stream, int lexState) { + ReInit(stream); + SwitchTo(lexState); + } + + public void SwitchTo(int lexState) { + if(lexState >= 2 || lexState < 0) + throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE); else - error_column++; - } - if (!EOFSeen) { - input_stream.backup(1); - error_after = curPos <= 1 ? "" : input_stream.GetImage(); - } - throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR); - } -} + curLexState = lexState; + } + + protected Token jjFillToken() { + Token t = Token.newToken(jjmatchedKind); + t.kind = jjmatchedKind; + String im = jjstrLiteralImages[jjmatchedKind]; + t.image = (im == null) ? input_stream.GetImage() : im; + t.beginLine = input_stream.getBeginLine(); + t.beginColumn = input_stream.getBeginColumn(); + t.endLine = input_stream.getEndLine(); + t.endColumn = input_stream.getEndColumn(); + return t; + } + + int curLexState = 0; + int defaultLexState = 0; + int jjnewStateCnt; + int jjround; + int jjmatchedPos; + int jjmatchedKind; + + public Token getNextToken() { + int kind; + Token specialToken = null; + Token matchedToken; + int curPos = 0; + + EOFLoop : + for(; ;) { + try { + curChar = input_stream.BeginToken(); + } catch(java.io.IOException e) { + jjmatchedKind = 0; + matchedToken = jjFillToken(); + return matchedToken; + } + + switch(curLexState) { + case 0: + jjmatchedKind = 0x7fffffff; + jjmatchedPos = 0; + curPos = jjMoveStringLiteralDfa0_0(); + break; + case 1: + jjmatchedKind = 0x7fffffff; + jjmatchedPos = 0; + curPos = jjMoveStringLiteralDfa0_1(); + break; + } + if(jjmatchedKind != 0x7fffffff) { + if(jjmatchedPos + 1 < curPos) + input_stream.backup(curPos - jjmatchedPos - 1); + matchedToken = jjFillToken(); + if(jjnewLexState[jjmatchedKind] != -1) + curLexState = jjnewLexState[jjmatchedKind]; + return matchedToken; + } + int error_line = input_stream.getEndLine(); + int error_column = input_stream.getEndColumn(); + String error_after = null; + boolean EOFSeen = false; + try { + input_stream.readChar(); + input_stream.backup(1); + } catch(java.io.IOException e1) { + EOFSeen = true; + error_after = curPos <= 1 ? "" : input_stream.GetImage(); + if(curChar == '\n' || curChar == '\r') { + error_line++; + error_column = 0; + } else + error_column++; + } + if(!EOFSeen) { + input_stream.backup(1); + error_after = curPos <= 1 ? "" : input_stream.GetImage(); + } + throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR); + } + } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/ParseException.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/ParseException.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/ParseException.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/ParseException.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/ParseException.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/ParseException.java Wed Jan 19 11:00:31 2005 @@ -22,187 +22,185 @@ * You can explicitly create objects of this exception type by * calling the method generateParseException in the generated * parser. - * + * <p/> * You can modify this class to customize your error reporting * mechanisms so long as you retain the public fields. */ -public class ParseException extends Exception { +public class ParseException + extends Exception { - /** - * This constructor is used by the method "generateParseException" - * in the generated parser. Calling this constructor generates - * a new object of this type with the fields "currentToken", - * "expectedTokenSequences", and "tokenImage" set. The boolean - * flag "specialConstructor" is also set to true to indicate that - * this constructor was used to create this object. - * This constructor calls its super class with the empty string - * to force the "toString" method of parent class "Throwable" to - * print the error message in the form: - * ParseException: <result of getMessage> - */ - public ParseException(Token currentTokenVal, - int[][] expectedTokenSequencesVal, - String[] tokenImageVal - ) - { - super(""); - specialConstructor = true; - currentToken = currentTokenVal; - expectedTokenSequences = expectedTokenSequencesVal; - tokenImage = tokenImageVal; - } - - /** - * The following constructors are for use by you for whatever - * purpose you can think of. Constructing the exception in this - * manner makes the exception behave in the normal way - i.e., as - * documented in the class "Throwable". The fields "errorToken", - * "expectedTokenSequences", and "tokenImage" do not contain - * relevant information. The JavaCC generated code does not use - * these constructors. - */ - - public ParseException() { - super(); - specialConstructor = false; - } - - public ParseException(String message) { - super(message); - specialConstructor = false; - } - - /** - * This variable determines which constructor was used to create - * this object and thereby affects the semantics of the - * "getMessage" method (see below). - */ - protected boolean specialConstructor; - - /** - * This is the last token that has been consumed successfully. If - * this object has been created due to a parse error, the token - * followng this token will (therefore) be the first error token. - */ - public Token currentToken; - - /** - * Each entry in this array is an array of integers. Each array - * of integers represents a sequence of tokens (by their ordinal - * values) that is expected at this point of the parse. - */ - public int[][] expectedTokenSequences; - - /** - * This is a reference to the "tokenImage" array of the generated - * parser within which the parse error occurred. This array is - * defined in the generated ...Constants interface. - */ - public String[] tokenImage; - - /** - * This method has the standard behavior when this object has been - * created using the standard constructors. Otherwise, it uses - * "currentToken" and "expectedTokenSequences" to generate a parse - * error message and returns it. If this object has been created - * due to a parse error, and you do not catch it (it gets thrown - * from the parser), then this method is called during the printing - * of the final stack trace, and hence the correct error message - * gets displayed. - */ - public String getMessage() { - if (!specialConstructor) { - return super.getMessage(); + /** + * This constructor is used by the method "generateParseException" + * in the generated parser. Calling this constructor generates + * a new object of this type with the fields "currentToken", + * "expectedTokenSequences", and "tokenImage" set. The boolean + * flag "specialConstructor" is also set to true to indicate that + * this constructor was used to create this object. + * This constructor calls its super class with the empty string + * to force the "toString" method of parent class "Throwable" to + * print the error message in the form: + * ParseException: <result of getMessage> + */ + public ParseException(Token currentTokenVal, + int[][] expectedTokenSequencesVal, + String[] tokenImageVal) { + super(""); + specialConstructor = true; + currentToken = currentTokenVal; + expectedTokenSequences = expectedTokenSequencesVal; + tokenImage = tokenImageVal; } - String expected = ""; - int maxSize = 0; - for (int i = 0; i < expectedTokenSequences.length; i++) { - if (maxSize < expectedTokenSequences[i].length) { - maxSize = expectedTokenSequences[i].length; - } - for (int j = 0; j < expectedTokenSequences[i].length; j++) { - expected += tokenImage[expectedTokenSequences[i][j]] + " "; - } - if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) { - expected += "..."; - } - expected += eol + " "; + + /** + * The following constructors are for use by you for whatever + * purpose you can think of. Constructing the exception in this + * manner makes the exception behave in the normal way - i.e., as + * documented in the class "Throwable". The fields "errorToken", + * "expectedTokenSequences", and "tokenImage" do not contain + * relevant information. The JavaCC generated code does not use + * these constructors. + */ + + public ParseException() { + super(); + specialConstructor = false; } - String retval = "Encountered \""; - Token tok = currentToken.next; - for (int i = 0; i < maxSize; i++) { - if (i != 0) retval += " "; - if (tok.kind == 0) { - retval += tokenImage[0]; - break; - } - retval += add_escapes(tok.image); - tok = tok.next; + + public ParseException(String message) { + super(message); + specialConstructor = false; } - retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn; - retval += "." + eol; - if (expectedTokenSequences.length == 1) { - retval += "Was expecting:" + eol + " "; - } else { - retval += "Was expecting one of:" + eol + " "; + + /** + * This variable determines which constructor was used to create + * this object and thereby affects the semantics of the + * "getMessage" method (see below). + */ + protected boolean specialConstructor; + + /** + * This is the last token that has been consumed successfully. If + * this object has been created due to a parse error, the token + * followng this token will (therefore) be the first error token. + */ + public Token currentToken; + + /** + * Each entry in this array is an array of integers. Each array + * of integers represents a sequence of tokens (by their ordinal + * values) that is expected at this point of the parse. + */ + public int[][] expectedTokenSequences; + + /** + * This is a reference to the "tokenImage" array of the generated + * parser within which the parse error occurred. This array is + * defined in the generated ...Constants interface. + */ + public String[] tokenImage; + + /** + * This method has the standard behavior when this object has been + * created using the standard constructors. Otherwise, it uses + * "currentToken" and "expectedTokenSequences" to generate a parse + * error message and returns it. If this object has been created + * due to a parse error, and you do not catch it (it gets thrown + * from the parser), then this method is called during the printing + * of the final stack trace, and hence the correct error message + * gets displayed. + */ + public String getMessage() { + if(!specialConstructor) { + return super.getMessage(); + } + String expected = ""; + int maxSize = 0; + for(int i = 0; i < expectedTokenSequences.length; i++) { + if(maxSize < expectedTokenSequences[i].length) { + maxSize = expectedTokenSequences[i].length; + } + for(int j = 0; j < expectedTokenSequences[i].length; j++) { + expected += tokenImage[expectedTokenSequences[i][j]] + " "; + } + if(expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) { + expected += "..."; + } + expected += eol + " "; + } + String retval = "Encountered \""; + Token tok = currentToken.next; + for(int i = 0; i < maxSize; i++) { + if(i != 0) retval += " "; + if(tok.kind == 0) { + retval += tokenImage[0]; + break; + } + retval += add_escapes(tok.image); + tok = tok.next; + } + retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn; + retval += "." + eol; + if(expectedTokenSequences.length == 1) { + retval += "Was expecting:" + eol + " "; + } else { + retval += "Was expecting one of:" + eol + " "; + } + retval += expected; + return retval; } - retval += expected; - return retval; - } - - /** - * The end of line string for this machine. - */ - protected String eol = System.getProperty("line.separator", "\n"); - - /** - * Used to convert raw characters to their escaped version - * when these raw version cannot be used as part of an ASCII - * string literal. - */ - protected String add_escapes(String str) { - StringBuffer retval = new StringBuffer(); - char ch; - for (int i = 0; i < str.length(); i++) { - switch (str.charAt(i)) - { - case 0 : - continue; - case '\b': - retval.append("\\b"); - continue; - case '\t': - retval.append("\\t"); - continue; - case '\n': - retval.append("\\n"); - continue; - case '\f': - retval.append("\\f"); - continue; - case '\r': - retval.append("\\r"); - continue; - case '\"': - retval.append("\\\""); - continue; - case '\'': - retval.append("\\\'"); - continue; - case '\\': - retval.append("\\\\"); - continue; - default: - if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) { - String s = "0000" + Integer.toString(ch, 16); - retval.append("\\u" + s.substring(s.length() - 4, s.length())); - } else { - retval.append(ch); - } - continue; + + /** + * The end of line string for this machine. + */ + protected String eol = System.getProperty("line.separator", "\n"); + + /** + * Used to convert raw characters to their escaped version + * when these raw version cannot be used as part of an ASCII + * string literal. + */ + protected String add_escapes(String str) { + StringBuffer retval = new StringBuffer(); + char ch; + for(int i = 0; i < str.length(); i++) { + switch(str.charAt(i)) { + case 0: + continue; + case '\b': + retval.append("\\b"); + continue; + case '\t': + retval.append("\\t"); + continue; + case '\n': + retval.append("\\n"); + continue; + case '\f': + retval.append("\\f"); + continue; + case '\r': + retval.append("\\r"); + continue; + case '\"': + retval.append("\\\""); + continue; + case '\'': + retval.append("\\\'"); + continue; + case '\\': + retval.append("\\\\"); + continue; + default: + if((ch = str.charAt(i)) < 0x20 || ch > 0x7e) { + String s = "0000" + Integer.toString(ch, 16); + retval.append("\\u" + s.substring(s.length() - 4, s.length())); + } else { + retval.append(ch); + } + continue; + } } - } - return retval.toString(); - } + return retval.toString(); + } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/SimpleCharStream.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/SimpleCharStream.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/SimpleCharStream.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/SimpleCharStream.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/SimpleCharStream.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/SimpleCharStream.java Wed Jan 19 11:00:31 2005 @@ -22,396 +22,350 @@ * contain only ASCII characters (without unicode processing). */ -public class SimpleCharStream -{ - public static final boolean staticFlag = false; - int bufsize; - int available; - int tokenBegin; - public int bufpos = -1; - protected int bufline[]; - protected int bufcolumn[]; - - protected int column = 0; - protected int line = 1; - - protected boolean prevCharIsCR = false; - protected boolean prevCharIsLF = false; - - protected java.io.Reader inputStream; - - protected char[] buffer; - protected int maxNextCharInd = 0; - protected int inBuf = 0; - - protected void ExpandBuff(boolean wrapAround) - { - char[] newbuffer = new char[bufsize + 2048]; - int newbufline[] = new int[bufsize + 2048]; - int newbufcolumn[] = new int[bufsize + 2048]; - - try - { - if (wrapAround) - { - System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin); - System.arraycopy(buffer, 0, newbuffer, - bufsize - tokenBegin, bufpos); - buffer = newbuffer; - - System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin); - System.arraycopy(bufline, 0, newbufline, bufsize - tokenBegin, bufpos); - bufline = newbufline; - - System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin); - System.arraycopy(bufcolumn, 0, newbufcolumn, bufsize - tokenBegin, bufpos); - bufcolumn = newbufcolumn; +public class SimpleCharStream { - maxNextCharInd = (bufpos += (bufsize - tokenBegin)); + public static final boolean staticFlag = false; + int bufsize; + int available; + int tokenBegin; + public int bufpos = -1; + protected int bufline[]; + protected int bufcolumn[]; + + protected int column = 0; + protected int line = 1; + + protected boolean prevCharIsCR = false; + protected boolean prevCharIsLF = false; + + protected java.io.Reader inputStream; + + protected char[] buffer; + protected int maxNextCharInd = 0; + protected int inBuf = 0; + + protected void ExpandBuff(boolean wrapAround) { + char[] newbuffer = new char[bufsize + 2048]; + int newbufline[] = new int[bufsize + 2048]; + int newbufcolumn[] = new int[bufsize + 2048]; + + try { + if(wrapAround) { + System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin); + System.arraycopy(buffer, 0, newbuffer, + bufsize - tokenBegin, bufpos); + buffer = newbuffer; + + System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin); + System.arraycopy(bufline, 0, newbufline, bufsize - tokenBegin, bufpos); + bufline = newbufline; + + System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin); + System.arraycopy(bufcolumn, 0, newbufcolumn, bufsize - tokenBegin, bufpos); + bufcolumn = newbufcolumn; + + maxNextCharInd = (bufpos += (bufsize - tokenBegin)); + } else { + System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin); + buffer = newbuffer; + + System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin); + bufline = newbufline; + + System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin); + bufcolumn = newbufcolumn; + + maxNextCharInd = (bufpos -= tokenBegin); + } + } catch(Throwable t) { + throw new Error(t.getMessage()); } - else - { - System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin); - buffer = newbuffer; - - System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin); - bufline = newbufline; - - System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin); - bufcolumn = newbufcolumn; - - maxNextCharInd = (bufpos -= tokenBegin); - } - } - catch (Throwable t) - { - throw new Error(t.getMessage()); - } - - - bufsize += 2048; - available = bufsize; - tokenBegin = 0; - } - - protected void FillBuff() throws java.io.IOException - { - if (maxNextCharInd == available) - { - if (available == bufsize) - { - if (tokenBegin > 2048) - { - bufpos = maxNextCharInd = 0; - available = tokenBegin; - } - else if (tokenBegin < 0) - bufpos = maxNextCharInd = 0; - else - ExpandBuff(false); - } - else if (available > tokenBegin) - available = bufsize; - else if ((tokenBegin - available) < 2048) - ExpandBuff(true); - else - available = tokenBegin; - } - int i; - try { - if ((i = inputStream.read(buffer, maxNextCharInd, - available - maxNextCharInd)) == -1) - { - inputStream.close(); - throw new java.io.IOException(); + + bufsize += 2048; + available = bufsize; + tokenBegin = 0; + } + + protected void FillBuff() throws java.io.IOException { + if(maxNextCharInd == available) { + if(available == bufsize) { + if(tokenBegin > 2048) { + bufpos = maxNextCharInd = 0; + available = tokenBegin; + } else if(tokenBegin < 0) + bufpos = maxNextCharInd = 0; + else + ExpandBuff(false); + } else if(available > tokenBegin) + available = bufsize; + else if((tokenBegin - available) < 2048) + ExpandBuff(true); + else + available = tokenBegin; } - else - maxNextCharInd += i; - return; - } - catch(java.io.IOException e) { - --bufpos; - backup(0); - if (tokenBegin == -1) - tokenBegin = bufpos; - throw e; - } - } - - public char BeginToken() throws java.io.IOException - { - tokenBegin = -1; - char c = readChar(); - tokenBegin = bufpos; - - return c; - } - - protected void UpdateLineColumn(char c) - { - column++; - - if (prevCharIsLF) - { - prevCharIsLF = false; - line += (column = 1); - } - else if (prevCharIsCR) - { - prevCharIsCR = false; - if (c == '\n') - { - prevCharIsLF = true; + + int i; + try { + if((i = inputStream.read(buffer, maxNextCharInd, + available - maxNextCharInd)) == -1) { + inputStream.close(); + throw new java.io.IOException(); + } else + maxNextCharInd += i; + return; + } catch(java.io.IOException e) { + --bufpos; + backup(0); + if(tokenBegin == -1) + tokenBegin = bufpos; + throw e; + } + } + + public char BeginToken() throws java.io.IOException { + tokenBegin = -1; + char c = readChar(); + tokenBegin = bufpos; + + return c; + } + + protected void UpdateLineColumn(char c) { + column++; + + if(prevCharIsLF) { + prevCharIsLF = false; + line += (column = 1); + } else if(prevCharIsCR) { + prevCharIsCR = false; + if(c == '\n') { + prevCharIsLF = true; + } else + line += (column = 1); + } + + switch(c) { + case '\r': + prevCharIsCR = true; + break; + case '\n': + prevCharIsLF = true; + break; + case '\t': + column--; + column += (8 - (column & 07)); + break; + default : + break; + } + + bufline[bufpos] = line; + bufcolumn[bufpos] = column; + } + + public char readChar() throws java.io.IOException { + if(inBuf > 0) { + --inBuf; + + if(++bufpos == bufsize) + bufpos = 0; + + return buffer[bufpos]; } + + if(++bufpos >= maxNextCharInd) + FillBuff(); + + char c = buffer[bufpos]; + + UpdateLineColumn(c); + return (c); + } + + /** + * @see #getEndColumn + * @deprecated + */ + + public int getColumn() { + return bufcolumn[bufpos]; + } + + /** + * @see #getEndLine + * @deprecated + */ + + public int getLine() { + return bufline[bufpos]; + } + + public int getEndColumn() { + return bufcolumn[bufpos]; + } + + public int getEndLine() { + return bufline[bufpos]; + } + + public int getBeginColumn() { + return bufcolumn[tokenBegin]; + } + + public int getBeginLine() { + return bufline[tokenBegin]; + } + + public void backup(int amount) { + + inBuf += amount; + if((bufpos -= amount) < 0) + bufpos += bufsize; + } + + public SimpleCharStream(java.io.Reader dstream, int startline, + int startcolumn, int buffersize) { + inputStream = dstream; + line = startline; + column = startcolumn - 1; + + available = bufsize = buffersize; + buffer = new char[buffersize]; + bufline = new int[buffersize]; + bufcolumn = new int[buffersize]; + } + + public SimpleCharStream(java.io.Reader dstream, int startline, + int startcolumn) { + this(dstream, startline, startcolumn, 4096); + } + + public SimpleCharStream(java.io.Reader dstream) { + this(dstream, 1, 1, 4096); + } + + public void ReInit(java.io.Reader dstream, int startline, + int startcolumn, int buffersize) { + inputStream = dstream; + line = startline; + column = startcolumn - 1; + + if(buffer == null || buffersize != buffer.length) { + available = bufsize = buffersize; + buffer = new char[buffersize]; + bufline = new int[buffersize]; + bufcolumn = new int[buffersize]; + } + prevCharIsLF = prevCharIsCR = false; + tokenBegin = inBuf = maxNextCharInd = 0; + bufpos = -1; + } + + public void ReInit(java.io.Reader dstream, int startline, + int startcolumn) { + ReInit(dstream, startline, startcolumn, 4096); + } + + public void ReInit(java.io.Reader dstream) { + ReInit(dstream, 1, 1, 4096); + } + + public SimpleCharStream(java.io.InputStream dstream, int startline, + int startcolumn, int buffersize) { + this(new java.io.InputStreamReader(dstream), startline, startcolumn, 4096); + } + + public SimpleCharStream(java.io.InputStream dstream, int startline, + int startcolumn) { + this(dstream, startline, startcolumn, 4096); + } + + public SimpleCharStream(java.io.InputStream dstream) { + this(dstream, 1, 1, 4096); + } + + public void ReInit(java.io.InputStream dstream, int startline, + int startcolumn, int buffersize) { + ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, 4096); + } + + public void ReInit(java.io.InputStream dstream) { + ReInit(dstream, 1, 1, 4096); + } + + public void ReInit(java.io.InputStream dstream, int startline, + int startcolumn) { + ReInit(dstream, startline, startcolumn, 4096); + } + + public String GetImage() { + if(bufpos >= tokenBegin) + return new String(buffer, tokenBegin, bufpos - tokenBegin + 1); else - line += (column = 1); - } + return new String(buffer, tokenBegin, bufsize - tokenBegin) + + new String(buffer, 0, bufpos + 1); + } + + public char[] GetSuffix(int len) { + char[] ret = new char[len]; + + if((bufpos + 1) >= len) + System.arraycopy(buffer, bufpos - len + 1, ret, 0, len); + else { + System.arraycopy(buffer, bufsize - (len - bufpos - 1), ret, 0, + len - bufpos - 1); + System.arraycopy(buffer, 0, ret, len - bufpos - 1, bufpos + 1); + } + + return ret; + } - switch (c) - { - case '\r' : - prevCharIsCR = true; - break; - case '\n' : - prevCharIsLF = true; - break; - case '\t' : - column--; - column += (8 - (column & 07)); - break; - default : - break; - } - - bufline[bufpos] = line; - bufcolumn[bufpos] = column; - } - - public char readChar() throws java.io.IOException - { - if (inBuf > 0) - { - --inBuf; - - if (++bufpos == bufsize) - bufpos = 0; - - return buffer[bufpos]; - } - - if (++bufpos >= maxNextCharInd) - FillBuff(); - - char c = buffer[bufpos]; - - UpdateLineColumn(c); - return (c); - } - - /** - * @deprecated - * @see #getEndColumn - */ - - public int getColumn() { - return bufcolumn[bufpos]; - } - - /** - * @deprecated - * @see #getEndLine - */ - - public int getLine() { - return bufline[bufpos]; - } - - public int getEndColumn() { - return bufcolumn[bufpos]; - } - - public int getEndLine() { - return bufline[bufpos]; - } - - public int getBeginColumn() { - return bufcolumn[tokenBegin]; - } - - public int getBeginLine() { - return bufline[tokenBegin]; - } - - public void backup(int amount) { - - inBuf += amount; - if ((bufpos -= amount) < 0) - bufpos += bufsize; - } - - public SimpleCharStream(java.io.Reader dstream, int startline, - int startcolumn, int buffersize) - { - inputStream = dstream; - line = startline; - column = startcolumn - 1; - - available = bufsize = buffersize; - buffer = new char[buffersize]; - bufline = new int[buffersize]; - bufcolumn = new int[buffersize]; - } - - public SimpleCharStream(java.io.Reader dstream, int startline, - int startcolumn) - { - this(dstream, startline, startcolumn, 4096); - } - - public SimpleCharStream(java.io.Reader dstream) - { - this(dstream, 1, 1, 4096); - } - public void ReInit(java.io.Reader dstream, int startline, - int startcolumn, int buffersize) - { - inputStream = dstream; - line = startline; - column = startcolumn - 1; - - if (buffer == null || buffersize != buffer.length) - { - available = bufsize = buffersize; - buffer = new char[buffersize]; - bufline = new int[buffersize]; - bufcolumn = new int[buffersize]; - } - prevCharIsLF = prevCharIsCR = false; - tokenBegin = inBuf = maxNextCharInd = 0; - bufpos = -1; - } - - public void ReInit(java.io.Reader dstream, int startline, - int startcolumn) - { - ReInit(dstream, startline, startcolumn, 4096); - } - - public void ReInit(java.io.Reader dstream) - { - ReInit(dstream, 1, 1, 4096); - } - public SimpleCharStream(java.io.InputStream dstream, int startline, - int startcolumn, int buffersize) - { - this(new java.io.InputStreamReader(dstream), startline, startcolumn, 4096); - } - - public SimpleCharStream(java.io.InputStream dstream, int startline, - int startcolumn) - { - this(dstream, startline, startcolumn, 4096); - } - - public SimpleCharStream(java.io.InputStream dstream) - { - this(dstream, 1, 1, 4096); - } - - public void ReInit(java.io.InputStream dstream, int startline, - int startcolumn, int buffersize) - { - ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, 4096); - } - - public void ReInit(java.io.InputStream dstream) - { - ReInit(dstream, 1, 1, 4096); - } - public void ReInit(java.io.InputStream dstream, int startline, - int startcolumn) - { - ReInit(dstream, startline, startcolumn, 4096); - } - public String GetImage() - { - if (bufpos >= tokenBegin) - return new String(buffer, tokenBegin, bufpos - tokenBegin + 1); - else - return new String(buffer, tokenBegin, bufsize - tokenBegin) + - new String(buffer, 0, bufpos + 1); - } - - public char[] GetSuffix(int len) - { - char[] ret = new char[len]; - - if ((bufpos + 1) >= len) - System.arraycopy(buffer, bufpos - len + 1, ret, 0, len); - else - { - System.arraycopy(buffer, bufsize - (len - bufpos - 1), ret, 0, - len - bufpos - 1); - System.arraycopy(buffer, 0, ret, len - bufpos - 1, bufpos + 1); - } - - return ret; - } - - public void Done() - { - buffer = null; - bufline = null; - bufcolumn = null; - } - - /** - * Method to adjust line and column numbers for the start of a token.<BR> - */ - public void adjustBeginLineColumn(int newLine, int newCol) - { - int start = tokenBegin; - int len; - - if (bufpos >= tokenBegin) - { - len = bufpos - tokenBegin + inBuf + 1; - } - else - { - len = bufsize - tokenBegin + bufpos + 1 + inBuf; - } - - int i = 0, j = 0, k = 0; - int nextColDiff = 0, columnDiff = 0; - - while (i < len && - bufline[j = start % bufsize] == bufline[k = ++start % bufsize]) - { - bufline[j] = newLine; - nextColDiff = columnDiff + bufcolumn[k] - bufcolumn[j]; - bufcolumn[j] = newCol + columnDiff; - columnDiff = nextColDiff; - i++; - } - - if (i < len) - { - bufline[j] = newLine++; - bufcolumn[j] = newCol + columnDiff; - - while (i++ < len) - { - if (bufline[j = start % bufsize] != bufline[++start % bufsize]) - bufline[j] = newLine++; - else - bufline[j] = newLine; - } - } - - line = bufline[j]; - column = bufcolumn[j]; - } + public void Done() { + buffer = null; + bufline = null; + bufcolumn = null; + } + + /** + * Method to adjust line and column numbers for the start of a token.<BR> + */ + public void adjustBeginLineColumn(int newLine, int newCol) { + int start = tokenBegin; + int len; + + if(bufpos >= tokenBegin) { + len = bufpos - tokenBegin + inBuf + 1; + } else { + len = bufsize - tokenBegin + bufpos + 1 + inBuf; + } + + int i = 0, j = 0, k = 0; + int nextColDiff = 0, columnDiff = 0; + + while(i < len && + bufline[j = start % bufsize] == bufline[k = ++start % bufsize]) { + bufline[j] = newLine; + nextColDiff = columnDiff + bufcolumn[k] - bufcolumn[j]; + bufcolumn[j] = newCol + columnDiff; + columnDiff = nextColDiff; + i++; + } + + if(i < len) { + bufline[j] = newLine++; + bufcolumn[j] = newCol + columnDiff; + + while(i++ < len) { + if(bufline[j = start % bufsize] != bufline[++start % bufsize]) + bufline[j] = newLine++; + else + bufline[j] = newLine; + } + } + + line = bufline[j]; + column = bufcolumn[j]; + } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/Token.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/Token.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/Token.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/Token.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/Token.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/Token.java Wed Jan 19 11:00:31 2005 @@ -23,75 +23,73 @@ public class Token { - /** - * An integer that describes the kind of this token. This numbering - * system is determined by JavaCCParser, and a table of these numbers is - * stored in the file ...Constants.java. - */ - public int kind; - - /** - * beginLine and beginColumn describe the position of the first character - * of this token; endLine and endColumn describe the position of the - * last character of this token. - */ - public int beginLine, beginColumn, endLine, endColumn; - - /** - * The string image of the token. - */ - public String image; - - /** - * A reference to the next regular (non-special) token from the input - * stream. If this is the last token from the input stream, or if the - * token manager has not read tokens beyond this one, this field is - * set to null. This is true only if this token is also a regular - * token. Otherwise, see below for a description of the contents of - * this field. - */ - public Token next; - - /** - * This field is used to access special tokens that occur prior to this - * token, but after the immediately preceding regular (non-special) token. - * If there are no such special tokens, this field is set to null. - * When there are more than one such special token, this field refers - * to the last of these special tokens, which in turn refers to the next - * previous special token through its specialToken field, and so on - * until the first special token (whose specialToken field is null). - * The next fields of special tokens refer to other special tokens that - * immediately follow it (without an intervening regular token). If there - * is no such token, this field is null. - */ - public Token specialToken; - - /** - * Returns the image. - */ - public String toString() - { - return image; - } - - /** - * Returns a new Token object, by default. However, if you want, you - * can create and return subclass objects based on the value of ofKind. - * Simply add the cases to the switch for all those special cases. - * For example, if you have a subclass of Token called IDToken that - * you want to create if ofKind is ID, simlpy add something like : - * - * case MyParserConstants.ID : return new IDToken(); - * - * to the following switch statement. Then you can cast matchedToken - * variable to the appropriate type and use it in your lexical actions. - */ - public static final Token newToken(int ofKind) - { - switch(ofKind) - { - default : return new Token(); - } - } + /** + * An integer that describes the kind of this token. This numbering + * system is determined by JavaCCParser, and a table of these numbers is + * stored in the file ...Constants.java. + */ + public int kind; + + /** + * beginLine and beginColumn describe the position of the first character + * of this token; endLine and endColumn describe the position of the + * last character of this token. + */ + public int beginLine, beginColumn, endLine, endColumn; + + /** + * The string image of the token. + */ + public String image; + + /** + * A reference to the next regular (non-special) token from the input + * stream. If this is the last token from the input stream, or if the + * token manager has not read tokens beyond this one, this field is + * set to null. This is true only if this token is also a regular + * token. Otherwise, see below for a description of the contents of + * this field. + */ + public Token next; + + /** + * This field is used to access special tokens that occur prior to this + * token, but after the immediately preceding regular (non-special) token. + * If there are no such special tokens, this field is set to null. + * When there are more than one such special token, this field refers + * to the last of these special tokens, which in turn refers to the next + * previous special token through its specialToken field, and so on + * until the first special token (whose specialToken field is null). + * The next fields of special tokens refer to other special tokens that + * immediately follow it (without an intervening regular token). If there + * is no such token, this field is null. + */ + public Token specialToken; + + /** + * Returns the image. + */ + public String toString() { + return image; + } + + /** + * Returns a new Token object, by default. However, if you want, you + * can create and return subclass objects based on the value of ofKind. + * Simply add the cases to the switch for all those special cases. + * For example, if you have a subclass of Token called IDToken that + * you want to create if ofKind is ID, simlpy add something like : + * <p/> + * case MyParserConstants.ID : return new IDToken(); + * <p/> + * to the following switch statement. Then you can cast matchedToken + * variable to the appropriate type and use it in your lexical actions. + */ + public static final Token newToken(int ofKind) { + switch(ofKind) { + default : + return new Token(); + } + } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/TokenMgrError.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/TokenMgrError.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/TokenMgrError.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/TokenMgrError.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/TokenMgrError.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/TokenMgrError.java Wed Jan 19 11:00:31 2005 @@ -17,133 +17,133 @@ */ package org.apache.beehive.netui.script.el.parser; -public class TokenMgrError extends Error -{ - /* - * Ordinals for various reasons why an Error of this type can be thrown. - */ - - /** - * Lexical error occured. - */ - static final int LEXICAL_ERROR = 0; - - /** - * An attempt wass made to create a second instance of a static token manager. - */ - static final int STATIC_LEXER_ERROR = 1; - - /** - * Tried to change to an invalid lexical state. - */ - static final int INVALID_LEXICAL_STATE = 2; - - /** - * Detected (and bailed out of) an infinite loop in the token manager. - */ - static final int LOOP_DETECTED = 3; - - /** - * Indicates the reason why the exception is thrown. It will have - * one of the above 4 values. - */ - int errorCode; - - /** - * Replaces unprintable characters by their espaced (or unicode escaped) - * equivalents in the given string - */ - protected static final String addEscapes(String str) { - StringBuffer retval = new StringBuffer(); - char ch; - for (int i = 0; i < str.length(); i++) { - switch (str.charAt(i)) - { - case 0 : - continue; - case '\b': - retval.append("\\b"); - continue; - case '\t': - retval.append("\\t"); - continue; - case '\n': - retval.append("\\n"); - continue; - case '\f': - retval.append("\\f"); - continue; - case '\r': - retval.append("\\r"); - continue; - case '\"': - retval.append("\\\""); - continue; - case '\'': - retval.append("\\\'"); - continue; - case '\\': - retval.append("\\\\"); - continue; - default: - if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) { - String s = "0000" + Integer.toString(ch, 16); - retval.append("\\u" + s.substring(s.length() - 4, s.length())); - } else { - retval.append(ch); - } - continue; +public class TokenMgrError + extends Error { + + /* + * Ordinals for various reasons why an Error of this type can be thrown. + */ + + /** + * Lexical error occured. + */ + static final int LEXICAL_ERROR = 0; + + /** + * An attempt wass made to create a second instance of a static token manager. + */ + static final int STATIC_LEXER_ERROR = 1; + + /** + * Tried to change to an invalid lexical state. + */ + static final int INVALID_LEXICAL_STATE = 2; + + /** + * Detected (and bailed out of) an infinite loop in the token manager. + */ + static final int LOOP_DETECTED = 3; + + /** + * Indicates the reason why the exception is thrown. It will have + * one of the above 4 values. + */ + int errorCode; + + /** + * Replaces unprintable characters by their espaced (or unicode escaped) + * equivalents in the given string + */ + protected static final String addEscapes(String str) { + StringBuffer retval = new StringBuffer(); + char ch; + for(int i = 0; i < str.length(); i++) { + switch(str.charAt(i)) { + case 0: + continue; + case '\b': + retval.append("\\b"); + continue; + case '\t': + retval.append("\\t"); + continue; + case '\n': + retval.append("\\n"); + continue; + case '\f': + retval.append("\\f"); + continue; + case '\r': + retval.append("\\r"); + continue; + case '\"': + retval.append("\\\""); + continue; + case '\'': + retval.append("\\\'"); + continue; + case '\\': + retval.append("\\\\"); + continue; + default: + if((ch = str.charAt(i)) < 0x20 || ch > 0x7e) { + String s = "0000" + Integer.toString(ch, 16); + retval.append("\\u" + s.substring(s.length() - 4, s.length())); + } else { + retval.append(ch); + } + continue; + } } - } - return retval.toString(); - } - - /** - * Returns a detailed message for the Error when it is thrown by the - * token manager to indicate a lexical error. - * Parameters : - * EOFSeen : indicates if EOF caused the lexicl error - * curLexState : lexical state in which this error occured - * errorLine : line number when the error occured - * errorColumn : column number when the error occured - * errorAfter : prefix that was seen before this error occured - * curchar : the offending character - * Note: You can customize the lexical error message by modifying this method. - */ - protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) { - return("Lexical error at line " + - errorLine + ", column " + - errorColumn + ". Encountered: " + - (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int)curChar + "), ") + - "after : \"" + addEscapes(errorAfter) + "\""); - } - - /** - * You can also modify the body of this method to customize your error messages. - * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not - * of end-users concern, so you can return something like : - * - * "Internal Error : Please file a bug report .... " - * - * from this method for such cases in the release version of your parser. - */ - public String getMessage() { - return super.getMessage(); - } - - /* - * Constructors of various flavors follow. - */ - - public TokenMgrError() { - } - - public TokenMgrError(String message, int reason) { - super(message); - errorCode = reason; - } - - public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) { - this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason); - } + return retval.toString(); + } + + /** + * Returns a detailed message for the Error when it is thrown by the + * token manager to indicate a lexical error. + * Parameters : + * EOFSeen : indicates if EOF caused the lexicl error + * curLexState : lexical state in which this error occured + * errorLine : line number when the error occured + * errorColumn : column number when the error occured + * errorAfter : prefix that was seen before this error occured + * curchar : the offending character + * Note: You can customize the lexical error message by modifying this method. + */ + protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) { + return ("Lexical error at line " + + errorLine + ", column " + + errorColumn + ". Encountered: " + + (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int)curChar + "), ") + + "after : \"" + addEscapes(errorAfter) + "\""); + } + + /** + * You can also modify the body of this method to customize your error messages. + * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not + * of end-users concern, so you can return something like : + * <p/> + * "Internal Error : Please file a bug report .... " + * <p/> + * from this method for such cases in the release version of your parser. + */ + public String getMessage() { + return super.getMessage(); + } + + /* + * Constructors of various flavors follow. + */ + + public TokenMgrError() { + } + + public TokenMgrError(String message, int reason) { + super(message); + errorCode = reason; + } + + public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) { + this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason); + } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ArrayIndexToken.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ArrayIndexToken.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ArrayIndexToken.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ArrayIndexToken.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ArrayIndexToken.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ArrayIndexToken.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.script.el.tokens; // java imports + import java.util.List; // internal imports @@ -29,53 +30,46 @@ * */ public class ArrayIndexToken - extends ExpressionToken -{ + extends ExpressionToken { + private static final Logger _logger = Logger.getInstance(ArrayIndexToken.class); private int index; - - public ArrayIndexToken(String identifier) - { + + public ArrayIndexToken(String identifier) { index = Integer.parseInt(identifier); } - public void update(Object root, Object newValue) - { + public void update(Object root, Object newValue) { if(root instanceof List) listUpdate((List)root, index, newValue); else if(root.getClass().isArray()) arrayUpdate(root, index, newValue); - else - { - RuntimeException re = new RuntimeException("The index \"" + index + "\" can not be used to look-up the type of a property" + - " on an object that is not an array or list."); + else { + RuntimeException re = new RuntimeException("The index \"" + index + "\" can not be used to look-up the type of a property" + + " on an object that is not an array or list."); _logger.error("", re); throw re; } } - public Object evaluate(Object value) - { + public Object evaluate(Object value) { if(value instanceof List) return listLookup((List)value, index); else if(value.getClass().isArray()) return arrayLookup(value, index); - else - { + else { RuntimeException re = new RuntimeException("The index \"" + index + "\" can not be used to look-up a property on an object that is not an array or list."); _logger.error("", re); throw re; } } - public String getTokenString() - { + public String getTokenString() { return "[" + index + "]"; } - public String toString() - { + public String toString() { return "" + index; } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ContextToken.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ContextToken.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ContextToken.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ContextToken.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ContextToken.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ContextToken.java Wed Jan 19 11:00:31 2005 @@ -18,36 +18,30 @@ package org.apache.beehive.netui.script.el.tokens; public class ContextToken - extends ExpressionToken -{ + extends ExpressionToken { + private String context = null; - - public ContextToken(String context) - { + + public ContextToken(String context) { this.context = context; } - public void update(Object value, Object newValue) - { + public void update(Object value, Object newValue) { } - public String getName() - { + public String getName() { return context; } - public Object evaluate(Object value) - { + public Object evaluate(Object value) { return null; } - public String getTokenString() - { + public String getTokenString() { return context; } - public String toString() - { + public String toString() { return context; } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java Wed Jan 19 11:00:31 2005 @@ -30,8 +30,8 @@ /** * */ -public abstract class ExpressionToken -{ +public abstract class ExpressionToken { + private static final Logger _logger = Logger.getInstance(ArrayIndexToken.class); private static final PropertyCache cache = new PropertyCache(); @@ -49,40 +49,34 @@ * */ - protected final Object mapLookup(Map map, Object identifier) - { + protected final Object mapLookup(Map map, Object identifier) { if(_logger.isDebugEnabled()) _logger.debug("mapLookup: " + identifier); return map.get(identifier); } - protected final Object beanLookup(Object bean, Object identifier) - { + protected final Object beanLookup(Object bean, Object identifier) { if(_logger.isDebugEnabled()) _logger.debug("beanLookup: " + identifier); return ParseUtils.getProperty(bean, identifier.toString(), cache); } - protected final Object listLookup(List list, int index) - { + protected final Object listLookup(List list, int index) { if(_logger.isDebugEnabled()) _logger.debug("listLookup: " + index); return list.get(index); } - protected final Object arrayLookup(Object array, int index) - { + protected final Object arrayLookup(Object array, int index) { if(_logger.isDebugEnabled()) _logger.debug("arrayLookup: " + index); return Array.get(array, index); } - protected final void mapUpdate(Map map, Object identifier, Object value) - { + protected final void mapUpdate(Map map, Object identifier, Object value) { Object converted = value; Object o = map.get(identifier); - if(o != null) - { + if(o != null) { Class type = o.getClass(); value = ParseUtils.convertType(value, type); } @@ -90,48 +84,38 @@ map.put(identifier, value); } - protected final void arrayUpdate(Object array, int index, Object value) - { + protected final void arrayUpdate(Object array, int index, Object value) { Object converted = value; - + Class elementType = array.getClass().getComponentType(); - if(!elementType.isAssignableFrom(value.getClass())) - { + if(!elementType.isAssignableFrom(value.getClass())) { converted = ParseUtils.convertType(value, elementType); } - - try - { + + try { Array.set(array, index, converted); - } - catch(Exception e) - { - String msg = "An error occurred setting a value at index \"" + index + "\" on an array with component types \"" + + } catch(Exception e) { + String msg = "An error occurred setting a value at index \"" + index + "\" on an array with component types \"" + elementType + "\". Cause: " + e.toString(); - + if(_logger.isErrorEnabled()) _logger.error(msg); throw new RuntimeException(msg); } } - protected final void listUpdate(List list, int index, Object value) - { + protected final void listUpdate(List list, int index, Object value) { Object converted = value; - if(list.size() > index) - { + if(list.size() > index) { Object o = list.get(index); // can only convert types when there is an item in the currently requested place - if(o != null) - { + if(o != null) { Class itemType = o.getClass(); converted = ParseUtils.convertType(value, itemType); } - + list.set(index, value); - } - else - { + } else { // @note: not sure that this is the right thing. Question is whether or not to insert nulls here to fill list up to "index" // @update: List doesn't guarantee that implementations will accept nulls. So, we can't rely on that as a solution. // @update: this is an unfortunate but necessary solution...unless the List has enough elements to @@ -152,8 +136,8 @@ // September 2, 2003 // [EMAIL PROTECTED] // - String msg = "An error occurred setting a value at index \"" + index + "\" because the list is " + - (list != null ? (" of size " + list.size()) : "null") + ". " + + String msg = "An error occurred setting a value at index \"" + index + "\" because the list is " + + (list != null ? (" of size " + list.size()) : "null") + ". " + "Be sure to allocate enough items in the List to accomodate any updates which may occur against the list."; if(_logger.isErrorEnabled()) _logger.error(msg); @@ -162,27 +146,21 @@ } } - protected final void beanUpdate(Object bean, Object identifier, Object value) - { + protected final void beanUpdate(Object bean, Object identifier, Object value) { if(_logger.isDebugEnabled()) _logger.debug("Update \"" + bean + "\" type field/property \"" + identifier + "\""); String id = identifier.toString(); Class beanType = bean.getClass(); Field f = cache.getField(beanType, id); - if(f != null) - { + if(f != null) { Class targetType = f.getType(); - try - { - if(java.util.List.class.isAssignableFrom(targetType)) - { + try { + if(java.util.List.class.isAssignableFrom(targetType)) { List list = (List)f.get(bean); applyValuesToList(value, list); return; - } - else - { + } else { if(_logger.isDebugEnabled()) _logger.debug("Apply value via field: " + f); Object converted = ParseUtils.convertType(value, targetType); @@ -190,55 +168,44 @@ return; } - } - catch(Exception e) - { + } catch(Exception e) { String msg = "Could not update field named \"" + id + "\" on bean of type \"" + beanType + "\". Cause: " + e; if(_logger.isErrorEnabled()) _logger.error(msg, e); throw new RuntimeException(msg, e); } } - + Class propType = cache.getPropertyType(beanType, id); - if(propType != null) - { - try - { - if(java.util.List.class.isAssignableFrom(propType)) - { + if(propType != null) { + try { + if(java.util.List.class.isAssignableFrom(propType)) { Method lm = cache.getPropertyGetter(beanType, id); - if(lm != null) - { + if(lm != null) { List list = (List)lm.invoke(bean, (Object[])null); applyValuesToList(value, list); return; } - } - else - { + } else { Method m = cache.getPropertySetter(beanType, id); - - if(m != null) - { + + if(m != null) { if(_logger.isDebugEnabled()) _logger.debug("Apply value to property via method: " + m); Class targetType = m.getParameterTypes()[0]; Object converted = ParseUtils.convertType(value, targetType); - - m.invoke(bean, new Object[] {converted}); + + m.invoke(bean, new Object[]{converted}); return; } } - } - catch(Exception e) - { + } catch(Exception e) { String msg = "Could not update proprety named \"" + id + "\" on bean of type \"" + beanType + "\". Cause: " + e; if(_logger.isErrorEnabled()) _logger.error(msg, e); throw new RuntimeException(msg, e); } } - String msg = "Could not update expression because a public field named \"" + id + "\" or setter for the property \"" + + String msg = "Could not update expression because a public field named \"" + id + "\" or setter for the property \"" + identifier + "\" could not be found."; if(_logger.isErrorEnabled()) _logger.error(msg); @@ -246,45 +213,36 @@ throw new RuntimeException(msg); } - protected final int parseIndex(String identifier) - { - try - { + protected final int parseIndex(String identifier) { + try { return Integer.parseInt(identifier); - } - catch(Exception e) - { + } catch(Exception e) { String msg = "Error performing an array look-up with the index \"" + identifier + "\". Cause: " + e; - + if(_logger.isDebugEnabled()) _logger.debug(msg, e); throw new RuntimeException(msg, e); } } - private static final void applyValuesToList(Object value, List list) - { - if(list == null) - { + private static final void applyValuesToList(Object value, List list) { + if(list == null) { String msg = "Can not add a field onto a null java.util.List"; if(_logger.isErrorEnabled()) _logger.error(msg); throw new RuntimeException(msg); } - if(value instanceof String[]) - { + if(value instanceof String[]) { String[] ary = (String[])value; - for(int i = 0; i < ary.length; i++) - { + for(int i = 0; i < ary.length; i++) { list.add(ary[i]); } - } - else if(value instanceof String) - { + } else if(value instanceof String) { list.add(value); } // types that are not String[] or String are just set on the object - else list.add(value); + else + list.add(value); } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/IdentifierToken.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/IdentifierToken.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/IdentifierToken.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/IdentifierToken.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/IdentifierToken.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/IdentifierToken.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.script.el.tokens; // java imports + import java.util.List; import java.util.Map; @@ -28,56 +29,45 @@ * */ public class IdentifierToken - extends ExpressionToken -{ + extends ExpressionToken { + private static final Logger _logger = Logger.getInstance(IdentifierToken.class); private static final boolean debugEnabled = _logger.isDebugEnabled(); private String identifier = null; - - public IdentifierToken(String identifier) - { + + public IdentifierToken(String identifier) { this.identifier = identifier; } - public Object evaluate(Object value) - { + public Object evaluate(Object value) { // @TODO: error handling - if(value == null) - { + if(value == null) { String msg = "Can not evaluate the identifier \"" + identifier + "\" on a null value object."; if(_logger.isErrorEnabled()) _logger.error(msg); throw new RuntimeException(msg); } - if(debugEnabled) - { + if(debugEnabled) { _logger.debug("evaluate: " + identifier); _logger.debug("value type: " + value.getClass().getName()); } - if(value instanceof Map) - { + if(value instanceof Map) { return mapLookup((Map)value, identifier); - } - else if(value instanceof List) - { + } else if(value instanceof List) { int i = parseIndex(identifier); return listLookup((List)value, i); - } - else if(value.getClass().isArray()) - { + } else if(value.getClass().isArray()) { int i = parseIndex(identifier); return arrayLookup(value, i); - } - else return beanLookup(value, identifier); + } else + return beanLookup(value, identifier); } - public void update(Object root, Object newValue) - { + public void update(Object root, Object newValue) { // @TODO: error handling - if(root == null) - { + if(root == null) { String msg = "Can not update the identifier \"" + identifier + "\" on a null value object."; if(_logger.isErrorEnabled()) _logger.error(msg); throw new RuntimeException(msg); @@ -87,26 +77,21 @@ if(root instanceof Map) mapUpdate((Map)root, identifier, newValue); - else if(root instanceof List) - { + else if(root instanceof List) { int i = parseIndex(identifier); listUpdate((List)root, i, newValue); - } - else if(root.getClass().isArray()) - { + } else if(root.getClass().isArray()) { int i = parseIndex(identifier); arrayUpdate(root, i, newValue); - } - else beanUpdate(root, identifier, newValue); + } else + beanUpdate(root, identifier, newValue); } - public String getTokenString() - { + public String getTokenString() { return "." + identifier; } - public String toString() - { + public String toString() { return identifier; } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/MapKeyToken.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/MapKeyToken.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/MapKeyToken.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/MapKeyToken.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/MapKeyToken.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/MapKeyToken.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.script.el.tokens; // java imports + import java.util.Map; // internal imports @@ -29,15 +30,14 @@ * */ public class MapKeyToken - extends ExpressionToken -{ + extends ExpressionToken { + private static final Logger _logger = Logger.getInstance(MapKeyToken.class); private String identifier = null; private boolean dblQuote = false; - - public MapKeyToken(String identifier) - { + + public MapKeyToken(String identifier) { this.identifier = identifier; if(identifier.startsWith("\"")) @@ -45,73 +45,73 @@ // convert the Java string to an EcmaScript string. Strip the quotes that exist because they're // always there for this token. - this.identifier = convertToEcmaScriptString(this.identifier.substring(1, identifier.length()-1)); + this.identifier = convertToEcmaScriptString(this.identifier.substring(1, identifier.length() - 1)); } /** * Given a Java String, this value needs to be converted into a JavaScript compliant String. * See JavaScript: The Definitive Guide for how to do this */ - private final String convertToEcmaScriptString(String string) - { + private final String convertToEcmaScriptString(String string) { CharSequence cs = string; int len = cs.length(); StringBuffer buf = new StringBuffer(len); - for(int i = 0; i < len; i++) - { + for(int i = 0; i < len; i++) { char c = cs.charAt(i); // skip the \\ and consume the next character either appending it or turning it back into the single character // that it should have been in the first place. // // if slash and not at the last character... - if(c == '\\' && i+1 < len) - { + if(c == '\\' && i + 1 < len) { i++; // skip the slash c = cs.charAt(i); - if(c == 'b') c = '\b'; - else if(c == 't') c = '\t'; - else if(c == 'n') c = '\n'; + if(c == 'b') + c = '\b'; + else if(c == 't') + c = '\t'; + else if(c == 'n') + c = '\n'; //else if(c == 'v') c = '\v'; - else if(c == 'f') c = '\f'; + else if(c == 'f') + c = '\f'; else if(c == 'r') c = '\r'; // @TODO: unicode escaping... } - + buf.append(c); } if(_logger.isDebugEnabled()) _logger.debug("new identifier: " + buf.toString()); - + return buf.toString(); } - public void update(Object root, Object newValue) - { + public void update(Object root, Object newValue) { if(root instanceof Map) mapUpdate((Map)root, identifier, newValue); - else beanUpdate(root, identifier, newValue); + else + beanUpdate(root, identifier, newValue); } - public Object evaluate(Object value) - { + public Object evaluate(Object value) { if(value instanceof Map) return mapLookup((Map)value, identifier); - else return beanLookup(value, identifier); + else + return beanLookup(value, identifier); } - public String getTokenString() - { + public String getTokenString() { if(dblQuote) return "[\"" + identifier + "\"]"; - else return "['" + identifier + "']"; + else + return "['" + identifier + "']"; } - public String toString() - { + public String toString() { return identifier; } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/AbstractAttributeMap.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/AbstractAttributeMap.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/AbstractAttributeMap.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/AbstractAttributeMap.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/AbstractAttributeMap.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/AbstractAttributeMap.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.script.el.util; // java imports + import java.util.Collection; import java.util.Enumeration; import java.util.HashMap; @@ -32,90 +33,77 @@ * */ public abstract class AbstractAttributeMap - implements Map -{ + implements Map { + private Map map = null; - + protected abstract Object getValue(Object key); protected abstract Object putValue(Object key, Object value); protected abstract Enumeration getKeysEnumeration(); - public void clear() {} - - public boolean containsKey(Object key) - { + public void clear() { + } + + public boolean containsKey(Object key) { return (getValue(key) != null); } - public boolean containsValue(Object key) - { + public boolean containsValue(Object key) { return getMap().containsValue(key); } - public Set entrySet() - { + public Set entrySet() { return getMap().entrySet(); } - public Object get(Object key) - { + public Object get(Object key) { return getValue(key); } - public boolean isEmpty() - { + public boolean isEmpty() { return getMap().isEmpty(); } - public Set keySet() - { + public Set keySet() { return getMap().keySet(); } - public Object put(Object key, Object value) - { + public Object put(Object key, Object value) { return putValue(key, value); } - public void putAll(Map t) - { + public void putAll(Map t) { getMap().putAll(t); } - public Object remove(Object key) - { + public Object remove(Object key) { return getMap().remove(key); } - public int size() - { + public int size() { return getMap().size(); } - public Collection values() - { + public Collection values() { return getMap().values(); } - private Map getMap() - { + private Map getMap() { if(map == null) map = convertToMap(); return map; } - private Map convertToMap() - { + private Map convertToMap() { if(map == null) map = new HashMap(); // why are we still stuck on enums? Enumeration keys = getKeysEnumeration(); - while(keys.hasMoreElements()) - { + while(keys.hasMoreElements()) { Object key = keys.nextElement(); map.put(key, getValue(key)); } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/BindingContext.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/BindingContext.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/BindingContext.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/BindingContext.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/BindingContext.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/BindingContext.java Wed Jan 19 11:00:31 2005 @@ -26,7 +26,7 @@ /** * */ -public interface BindingContext -{ +public interface BindingContext { + public Object unwrap(); } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java Wed Jan 19 11:00:31 2005 @@ -36,47 +36,41 @@ /** * */ -public class ParseUtils -{ +public class ParseUtils { + private static final Logger _logger = Logger.getInstance(ParseUtils.class); private static final HashMap<String, ParsedExpression> PARSED_CACHE = - new HashMap<String, ParsedExpression>(); + new HashMap<String, ParsedExpression>(); /* do not construct */ - private ParseUtils() {} + private ParseUtils() { + } - public static final ParsedExpression parse(String exprStr) - { + public static final ParsedExpression parse(String exprStr) { ParsedExpression pe = PARSED_CACHE.get(exprStr); if(pe != null) return pe; - try - { + try { NetUIELParser learn = new NetUIELParser(new StringReader(exprStr)); ParsedExpression expr = learn.parse(); expr.seal(); /* infrequent; this should only happen when there is a cache miss */ - synchronized(PARSED_CACHE) - { + synchronized(PARSED_CACHE) { PARSED_CACHE.put(exprStr, expr); } return expr; - } - catch(ParseException e) - { + } catch(ParseException e) { String msg = "Error occurred parsing expression \"" + exprStr + "\"."; if(_logger.isErrorEnabled()) _logger.error(msg, e); throw new ExpressionParseException(msg, e); - } - catch(TokenMgrError tm) - { + } catch(TokenMgrError tm) { String msg = "Error occurred parsing expression \"" + exprStr + "\"."; if(_logger.isErrorEnabled()) _logger.error(msg, tm); @@ -84,22 +78,19 @@ } } - public static final Object evaluate(String exprStr, NetUIVariableResolver vr) - { + public static final Object evaluate(String exprStr, NetUIVariableResolver vr) { ParsedExpression expr = parse(exprStr); assert expr != null; return expr.evaluate(vr); } - public static final void update(String exprStr, Object value, NetUIVariableResolver vr) - { + public static final void update(String exprStr, Object value, NetUIVariableResolver vr) { ParsedExpression expr = parse(exprStr); assert expr != null; expr.update(value, vr); } - public static final Class getPropertyType(Object value, String name, PropertyCache cache) - { + public static final Class getPropertyType(Object value, String name, PropertyCache cache) { assert value != null; assert cache != null; @@ -109,38 +100,31 @@ return f.getType(); Method m = cache.getPropertySetter(type, name); - if(m == null) - { + if(m == null) { String msg = "Can not find setter method for property \"" + name + "\" on object of type \"" + value.getClass() + "\"."; - + if(_logger.isErrorEnabled()) _logger.error(msg); throw new RuntimeException(msg); } // PropertyCache guarantees that props are found and match JavaBean naming rules - else - { - assert m.getParameterTypes().length == 1; + else { + assert m.getParameterTypes().length == 1; return m.getParameterTypes()[0]; } } - public static final Object getProperty(Object value, String name, PropertyCache cache) - { + public static final Object getProperty(Object value, String name, PropertyCache cache) { assert value != null; assert cache != null; Class type = value.getClass(); - + Field f = cache.getField(type, name); - if(f != null) - { - try - { + if(f != null) { + try { return f.get(value); - } - catch(Exception e) - { + } catch(Exception e) { String msg = "An error occurred evaluating the field \"" + name + "\" on an object of type \"" + type + "\"."; if(_logger.isDebugEnabled()) _logger.debug(msg, e); @@ -149,63 +133,52 @@ } Method m = cache.getPropertyGetter(type, name); - if(m != null) - { - try - { + if(m != null) { + try { return m.invoke(value, (Object[])null); - } - catch(Exception e) - { + } catch(Exception e) { String msg = "An error occurred invoking a getter for the property \"" + name + "\" on an object of type \"" + type + "\"."; if(_logger.isDebugEnabled()) _logger.debug(msg, e); throw new RuntimeException(msg, e); } } - + String msg = "Could not find property or field \"" + name + "\" on object of type \"" + type + "\""; if(_logger.isDebugEnabled()) _logger.debug(msg); throw new RuntimeException(msg); } - public static final Object convertType(Object value, Class toType) - { + public static final Object convertType(Object value, Class toType) { assert toType != null; - try - { + try { boolean sourceIsArray = false; /* only convert String types; other Object types are already assumed to be in their target types. */ - if(value != null && !(value instanceof String || (sourceIsArray = (value instanceof String[])) )) + if(value != null && !(value instanceof String || (sourceIsArray = (value instanceof String[])))) return value; /* for a String[], convert each item in the array into its target type and return the resulting array. */ - if(toType.isArray()) - { + if(toType.isArray()) { if(value == null) return null; - else - { + else { Class compType = toType.getComponentType(); - + String[] strs = null; if(value.getClass().isArray()) strs = (String[])value; - else strs = new String[] {(String)value}; - + else + strs = new String[]{(String)value}; + Object tgt = Array.newInstance(compType, strs.length); - - for(int i = 0; i < strs.length; i++) - { + + for(int i = 0; i < strs.length; i++) { Object o = null; - try - { + try { o = TypeUtils.convertToObject(strs[i], compType); - } - catch(IllegalArgumentException e) - { + } catch(IllegalArgumentException e) { String msg = "Can not set Object types via expressions that are not supported by the set of registered type converters. Cause: " + e; if(_logger.isErrorEnabled()) _logger.error(msg, e); @@ -214,13 +187,12 @@ Array.set(tgt, i, o); } - + return tgt; } } // convert the String into its target type and return the result - else - { + else { if(_logger.isDebugEnabled()) _logger.debug("convert value \"" + value + "\" to type: " + toType); @@ -228,31 +200,25 @@ // There is no policy defined for how we do this right now, so the first one will always win when // multiple expressions reference the same property. When that property is a String type, the result // is an HttpServletRequest that contains a String[], and here, we'll always the String[0]. - if(sourceIsArray) - { + if(sourceIsArray) { assert value instanceof String[]; - assert Array.getLength(value) > 0 && Array.getLength(value)-1 >= 0; + assert Array.getLength(value) > 0 && Array.getLength(value) - 1 >= 0; - value = Array.get(value, Array.getLength(value)-1); + value = Array.get(value, Array.getLength(value) - 1); } - - try - { + + try { assert value == null || value instanceof String; return TypeUtils.convertToObject((String)value, toType); - } - catch(IllegalArgumentException e) - { + } catch(IllegalArgumentException e) { String msg = "The type \"" + toType.getName() + "\" can not be set through XScript with the update value \"" + value + "\""; if(_logger.isErrorEnabled()) _logger.error(msg, e); throw new RuntimeException(msg, e); } } - } - catch(Exception e) - { + } catch(Exception e) { String msg = "Unable to convert a value of type \"" + value.getClass() + "\" to the array element type of \"" + toType + "\". Cause: " + e; if(_logger.isErrorEnabled()) _logger.error(msg, e); @@ -260,14 +226,11 @@ } } - public static String getContextString(String[] contexts) - { + public static String getContextString(String[] contexts) { StringBuilder builder = new StringBuilder(); builder.append("["); - if(contexts != null) - { - for(int i = 0; i < contexts.length; i++) - { + if(contexts != null) { + for(int i = 0; i < contexts.length; i++) { if(i > 0) builder.append(", "); builder.append(contexts[i]); } @@ -276,8 +239,7 @@ return builder.toString(); } - public static Throwable getRootCause(Throwable t) - { + public static Throwable getRootCause(Throwable t) { Throwable root = t; while(root.getCause() != null) root = root.getCause(); Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/RequestAttributeMap.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/RequestAttributeMap.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/RequestAttributeMap.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/RequestAttributeMap.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/RequestAttributeMap.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/RequestAttributeMap.java Wed Jan 19 11:00:31 2005 @@ -25,27 +25,23 @@ */ public class RequestAttributeMap extends AbstractAttributeMap - implements BindingContext -{ + implements BindingContext { + private ServletRequest request = null; - public RequestAttributeMap(ServletRequest request) - { + public RequestAttributeMap(ServletRequest request) { this.request = request; } - public Object unwrap() - { + public Object unwrap() { return request; } - protected Object getValue(Object key) - { + protected Object getValue(Object key) { return request.getAttribute(key.toString()); } - protected Object putValue(Object key, Object value) - { + protected Object putValue(Object key, Object value) { String strKey = key.toString(); Object prev = request.getAttribute(strKey); @@ -54,8 +50,7 @@ return prev; } - protected Enumeration getKeysEnumeration() - { + protected Enumeration getKeysEnumeration() { return request.getAttributeNames(); } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/SessionAttributeMap.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/SessionAttributeMap.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/SessionAttributeMap.java&r1=125642&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/SessionAttributeMap.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/SessionAttributeMap.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/SessionAttributeMap.java Wed Jan 19 11:00:31 2005 @@ -25,27 +25,23 @@ */ public class SessionAttributeMap extends AbstractAttributeMap - implements BindingContext -{ + implements BindingContext { + private HttpSession session = null; - public SessionAttributeMap(HttpSession session) - { + public SessionAttributeMap(HttpSession session) { this.session = session; } - public Object unwrap() - { + public Object unwrap() { return session; } - protected Object getValue(Object key) - { + protected Object getValue(Object key) { return session.getAttribute(key.toString()); } - protected Object putValue(Object key, Object value) - { + protected Object putValue(Object key, Object value) { String strKey = key.toString(); Object prev = session.getAttribute(strKey); @@ -54,8 +50,7 @@ return prev; } - protected Enumeration getKeysEnumeration() - { + protected Enumeration getKeysEnumeration() { return session.getAttributeNames(); } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java Wed Jan 19 11:00:31 2005 @@ -68,20 +68,20 @@ } public String formatText(Object value) { - if (value == null) + if(value == null) return null; - if (_formatters == null) + if(_formatters == null) return value.toString(); Object formatted = null; - for (Formatter formatter : _formatters) { + for(Formatter formatter : _formatters) { assert formatter != null; try { formatted = formatter.format(value); - } catch (JspException e) { + } catch(JspException e) { /* todo: error reporting */ - if (LOGGER.isErrorEnabled()) + if(LOGGER.isErrorEnabled()) LOGGER.error("A formatter of type \"" + formatter.getClass().getName() + "\" threw an exception " + e, e); } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java Wed Jan 19 11:00:31 2005 @@ -33,8 +33,8 @@ /** * */ -public class DataGridModel -{ +public class DataGridModel { + public static final int START_RENDER_STATE = 10; public static final int CAPTION_RENDER_STATE = 20; public static final int GRID_RENDER_STATE = 30; @@ -56,8 +56,7 @@ private JspContext _jspContext = null; - public DataGridModel(JspContext jspContext, String name, PagedDataSet dataSet) - { + public DataGridModel(JspContext jspContext, String name, PagedDataSet dataSet) { super(); _name = name; @@ -175,8 +174,7 @@ } } - public void renderPager(AbstractRenderAppender appender) - { + public void renderPager(AbstractRenderAppender appender) { assert getPagerRenderer() != null : "Received a null PagerRenderer"; appender.append(getPagerRenderer().render()); } @@ -187,28 +185,23 @@ * * =========================================================== */ - public int getCurrentIndex() - { + public int getCurrentIndex() { return _dataSet.getCurrentIndex(); } - public Object getCurrentItem() - { + public Object getCurrentItem() { return _dataSet.getCurrentItem(); } - public String getDataSource() - { + public String getDataSource() { return _dataSet.getDataSource(); } - public Object nextDataItem() - { + public Object nextDataItem() { return _dataSet.next(); } - public boolean hasNextDataItem() - { + public boolean hasNextDataItem() { return _dataSet.hasNext(); } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java Wed Jan 19 11:00:31 2005 @@ -166,7 +166,7 @@ public String[] getPagerParamValues() { String[] params = new String[getLastPage() + 1]; - for (int i = 0; i < params.length; i++) { + for(int i = 0; i < params.length; i++) { String p = buildQueryParam(i, false); if(p == null) p = EMPTY_STRING; @@ -199,8 +199,8 @@ sb.append(PagerService.DELIM); sb.append(row); return sb.toString(); - } - else return null; + } else + return null; } private void updatePagerState() { @@ -208,7 +208,8 @@ if(getRow() == 0) _currentPage = DEFAULT_PAGE; - else _currentPage = (int)Math.floor((double)getRow() / (double)getPageSize()); + else + _currentPage = (int)Math.floor((double)getRow() / (double)getPageSize()); _lastPage = (int)Math.floor((double)dataSetSize / (double)getPageSize()); _prevPage = _currentPage - 1; _nextPage = _currentPage + 1; Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/FilterModel.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/FilterModel.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/FilterModel.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/FilterModel.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/FilterModel.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/FilterModel.java Wed Jan 19 11:00:31 2005 @@ -46,7 +46,8 @@ public String getFilterParamKey() { if(_filterParamKey == null) return IFilter.FILTER_PARAM_KEY; - else return _filterParamKey; + else + return _filterParamKey; } public List<IFilter> getFilters(String filterExpression) { @@ -63,7 +64,8 @@ if(_filters.containsKey(filterExpression)) { assert _filters.get(filterExpression).size() > 0; return true; - } else return false; + } else + return false; } /** Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/IFilter.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/IFilter.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/IFilter.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/IFilter.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/IFilter.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/IFilter.java Wed Jan 19 11:00:31 2005 @@ -20,15 +20,17 @@ /** * */ -public interface IFilter -{ +public interface IFilter { + String FILTER_PARAM_KEY = "netui_filter"; enum FilterOperation { + EQUAL(1), NOT_EQUAL(2); private int _id; + FilterOperation(int id) { _id = id; } @@ -43,11 +45,11 @@ void setFilterExpression(String filterExpression); FilterOperation getOperation(); - + void setOperation(FilterOperation operation); - + Object getValue(); - + void setValue(Object value); String write(String namespace); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/DefaultSort.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/DefaultSort.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/DefaultSort.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/DefaultSort.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/DefaultSort.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/DefaultSort.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.databinding.datagrid.model.sort; /* Default sort syntax: netui_sort=<gridNamespace>~[+|-]<expr> */ + /** * */ @@ -82,8 +83,8 @@ private String writeSortParam(String namespace, boolean flipDirection) { SortDirection sortDirection = _sortDirection; - if (flipDirection) - /* todo: break this dependency. switch ISort to AbstractSort with utility methods */ + if(flipDirection) + /* todo: break this dependency. switch ISort to AbstractSort with utility methods */ sortDirection = sortDirection.flipDirection(); return writeSortParam(namespace, _sortExpression, sortDirection); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/ISort.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/ISort.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/ISort.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/ISort.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/ISort.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/ISort.java Wed Jan 19 11:00:31 2005 @@ -20,11 +20,12 @@ /** * */ -public interface ISort -{ +public interface ISort { + String SORT_PARAM_KEY = "netui_sort"; - enum SortDirection{ + enum SortDirection { + NONE, ASCENDING, DESCENDING; SortDirection flipDirection() { @@ -32,7 +33,8 @@ return SortDirection.DESCENDING; else if(this == SortDirection.DESCENDING) return SortDirection.ASCENDING; - else return SortDirection.ASCENDING; + else + return SortDirection.ASCENDING; } }; @@ -41,7 +43,7 @@ void setSortExpression(String sortExpression); SortDirection getDirection(); - + void setDirection(SortDirection sortDirection); String write(String namespace); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/SortModel.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/SortModel.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/SortModel.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/SortModel.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/SortModel.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/SortModel.java Wed Jan 19 11:00:31 2005 @@ -56,7 +56,8 @@ public String getSortParamKey() { if(_sortParamKey != null) return _sortParamKey; - else return ISort.SORT_PARAM_KEY; + else + return ISort.SORT_PARAM_KEY; } public Map buildSortQueryParamsMap() { @@ -91,11 +92,11 @@ for(ISort sort : sorts) { if(sort.getSortExpression().equals(sortExpression)) { if(sortDirection != SortDirection.NONE) - /* todo: broke encapsulation here. bad bad bad. */ - /* @todo: need to move this parameter handling into some sort of IUrlParams class that can be *fast* */ - valueList.add(DefaultSort.writeSortParam(_name, sort.getSortExpression(), sortDirection)); - } - else valueList.add(sort.write(_name)); + /* todo: broke encapsulation here. bad bad bad. */ + /* @todo: need to move this parameter handling into some sort of IUrlParams class that can be *fast* */ + valueList.add(DefaultSort.writeSortParam(_name, sort.getSortExpression(), sortDirection)); + } else + valueList.add(sort.write(_name)); } } @@ -107,17 +108,17 @@ public boolean isPrimarySort(String sortExpression) { /* optimize for the case where the sortExpression *is* the primary sort */ - if (_sorts != null && + if(_sorts != null && _sorts.size() > 0 && _sorts.get(0).getSortExpression().equals(sortExpression)) { return true; - } - else return false; + } else + return false; } public boolean isSorted(String sortExpression) { ISort term = findTerm(sortExpression); - if (term == null || term.getDirection() == SortDirection.NONE) + if(term == null || term.getDirection() == SortDirection.NONE) return false; else return true; @@ -133,8 +134,8 @@ if(term != null) { _sorts.remove(term); return true; - } - else return false; + } else + return false; } public void addSort(String sortExpression, SortDirection sortDirection) { @@ -154,11 +155,11 @@ } private ISort findTerm(String sortExpression) { - if (_sorts == null) + if(_sorts == null) return null; - for (ISort sort : _sorts) { - if (sort.getSortExpression().equals(sortExpression)) + for(ISort sort : _sorts) { + if(sort.getSortExpression().equals(sortExpression)) return sort; } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/DefaultStylePolicy.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/DefaultStylePolicy.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/DefaultStylePolicy.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/DefaultStylePolicy.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/DefaultStylePolicy.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/DefaultStylePolicy.java Wed Jan 19 11:00:31 2005 @@ -21,8 +21,8 @@ * */ public class DefaultStylePolicy - extends StylePolicy - { + extends StylePolicy { + public DefaultStylePolicy() { this(null); } @@ -71,7 +71,7 @@ private final String prefix(String styleBase) { String prefix = getStylePrefix(); StringBuilder sb = new StringBuilder(); - if (prefix != null) { + if(prefix != null) { sb.append(prefix); sb.append(DELIM); } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/EmptyStylePolicy.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/EmptyStylePolicy.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/EmptyStylePolicy.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/EmptyStylePolicy.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/EmptyStylePolicy.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/EmptyStylePolicy.java Wed Jan 19 11:00:31 2005 @@ -21,25 +21,49 @@ * */ public class EmptyStylePolicy - extends StylePolicy -{ - public EmptyStylePolicy() - { + extends StylePolicy { + + public EmptyStylePolicy() { this(null); } - public EmptyStylePolicy(String prefix) - { + public EmptyStylePolicy(String prefix) { super(prefix); } - - public String getTableClass() {return null;} - public String getHeaderRowClass() {return null;} - public String getFooterRowClass() {return null;} - public String getRowClass() {return null;} - public String getAltRowClass() {return null;} - public String getDataCellClass() {return null;} - public String getHeaderCellClass() {return null;} - public String getFooterCellClass() {return null;} - public String getHeaderCellSortedClass() {return null;} + + public String getTableClass() { + return null; + } + + public String getHeaderRowClass() { + return null; + } + + public String getFooterRowClass() { + return null; + } + + public String getRowClass() { + return null; + } + + public String getAltRowClass() { + return null; + } + + public String getDataCellClass() { + return null; + } + + public String getHeaderCellClass() { + return null; + } + + public String getFooterCellClass() { + return null; + } + + public String getHeaderCellSortedClass() { + return null; + } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/StylePolicy.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/StylePolicy.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/StylePolicy.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/StylePolicy.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/StylePolicy.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/StylePolicy.java Wed Jan 19 11:00:31 2005 @@ -22,8 +22,8 @@ /** * */ -public abstract class StylePolicy -{ +public abstract class StylePolicy { + private static final Logger LOGGER = Logger.getInstance(StylePolicy.class); /* todo: enum-ize this */ @@ -42,51 +42,63 @@ private String _stylePrefix = null; - public StylePolicy() - { + public StylePolicy() { super(); } - public StylePolicy(String stylePrefix) - { + public StylePolicy(String stylePrefix) { this(); _stylePrefix = stylePrefix; } - public String getStylePrefix() - { + public String getStylePrefix() { return _stylePrefix; } public abstract String getTableClass(); + public abstract String getHeaderRowClass(); + public abstract String getFooterRowClass(); + public abstract String getRowClass(); + public abstract String getAltRowClass(); + public abstract String getDataCellClass(); + public abstract String getHeaderCellClass(); + public abstract String getFooterCellClass(); + public abstract String getHeaderCellSortedClass(); - public String getClassForType(int cssClassType) - { - switch(cssClassType) - { - case TABLE_CLASS: return getTableClass(); - case HEADER_ROW_CLASS: return getHeaderRowClass(); - case FOOTER_ROW_CLASS: return getFooterRowClass(); - case ROW_CLASS: return getRowClass(); - case ALT_ROW_CLASS: return getAltRowClass(); - case HEADER_CELL_CLASS: return getHeaderCellClass(); - case DATA_CELL_CLASS: return getDataCellClass(); - case FOOTER_CELL_CLASS: return getFooterCellClass(); - case HEADER_CELL_SORTED_CLASS: return getHeaderCellSortedClass(); - default: - { - if(LOGGER.isDebugEnabled()) - LOGGER.debug("Unable to file style class for class type \"" + cssClassType + "\"."); - return ""; - } + public String getClassForType(int cssClassType) { + switch(cssClassType) { + case TABLE_CLASS: + return getTableClass(); + case HEADER_ROW_CLASS: + return getHeaderRowClass(); + case FOOTER_ROW_CLASS: + return getFooterRowClass(); + case ROW_CLASS: + return getRowClass(); + case ALT_ROW_CLASS: + return getAltRowClass(); + case HEADER_CELL_CLASS: + return getHeaderCellClass(); + case DATA_CELL_CLASS: + return getDataCellClass(); + case FOOTER_CELL_CLASS: + return getFooterCellClass(); + case HEADER_CELL_SORTED_CLASS: + return getHeaderCellSortedClass(); + default: + { + if(LOGGER.isDebugEnabled()) + LOGGER.debug("Unable to file style class for class type \"" + cssClassType + "\"."); + return ""; + } } } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/AnchorCellDecorator.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/AnchorCellDecorator.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/AnchorCellDecorator.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/AnchorCellDecorator.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/AnchorCellDecorator.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/AnchorCellDecorator.java Wed Jan 19 11:00:31 2005 @@ -59,14 +59,14 @@ String url = null; try { url = JspUtil.createURL(anchorCellModel.getHref(), - anchorCellModel.getAction(), - null, - anchorCellModel.getScopeId(), - anchorCellModel.getParams(), - jspContext); - } catch (URISyntaxException mue) { + anchorCellModel.getAction(), + null, + anchorCellModel.getScopeId(), + anchorCellModel.getParams(), + jspContext); + } catch(URISyntaxException mue) { - if (LOGGER.isErrorEnabled()) + if(LOGGER.isErrorEnabled()) LOGGER.error("Exception creating URL with href " + anchorCellModel.getHref() + " action " + anchorCellModel.getAction(), mue); throw new CellDecoratorException("An exception occurred creating an URL while decorating an Anchor", mue); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/HeaderCellDecorator.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/HeaderCellDecorator.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/HeaderCellDecorator.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/HeaderCellDecorator.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/HeaderCellDecorator.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/HeaderCellDecorator.java Wed Jan 19 11:00:31 2005 @@ -35,11 +35,12 @@ assert cellModel instanceof HeaderCellModel; HeaderCellModel headerCellModel = (HeaderCellModel)cellModel; - if (headerCellModel.getHeaderText() != null) + if(headerCellModel.getHeaderText() != null) appender.append(headerCellModel.getHeaderText()); else if(headerCellModel.getBodyContent() != null) appender.append(headerCellModel.getBodyContent()); - else appender.append(" "); + else + appender.append(" "); } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SortedCellDecorator.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SortedCellDecorator.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SortedCellDecorator.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SortedCellDecorator.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SortedCellDecorator.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SortedCellDecorator.java Wed Jan 19 11:00:31 2005 @@ -90,7 +90,8 @@ /* build icon for existing sort */ if(sortModel.isSorted(cellModel.getSortExpression())) imgTag.src = dgss.getSortImagePath(request.getContextPath(), sortDirection); - else imgTag.src = dgss.getDefaultSortImagePath(request.getContextPath()); + else + imgTag.src = dgss.getDefaultSortImagePath(request.getContextPath()); imgTag.registerAttribute(AbstractHtmlState.ATTR_GENERAL, HtmlConstants.BORDER, "false"); @@ -99,13 +100,12 @@ String href = null; try { href = JspUtil.createURL(request.getRequestURI(), - cellModel.getSortAction(), - null, - cellModel.getScopeId(), - queryParams, - dgm.getJspContext()); - } - catch(URISyntaxException se) { + cellModel.getSortAction(), + null, + cellModel.getScopeId(), + queryParams, + dgm.getJspContext()); + } catch(URISyntaxException se) { String msg = "Exception creating sort URI"; if(LOGGER.isErrorEnabled()) Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/AbstractPagerRenderer.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/AbstractPagerRenderer.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/AbstractPagerRenderer.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/AbstractPagerRenderer.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/AbstractPagerRenderer.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/AbstractPagerRenderer.java Wed Jan 19 11:00:31 2005 @@ -68,7 +68,7 @@ } public String render() { - if (_gridModel.getDataSet().getSize() == 0) + if(_gridModel.getDataSet().getSize() == 0) return noDataRender(); else return internalRender(); @@ -144,14 +144,14 @@ String uri = null; try { uri = JspUtil.createURL(_pagerModel.getPageHref(), - _pagerModel.getPageAction(), - null, - null, - queryParams, - _gridModel.getJspContext()); - } catch (URISyntaxException mue) { + _pagerModel.getPageAction(), + null, + null, + queryParams, + _gridModel.getJspContext()); + } catch(URISyntaxException mue) { - if (LOGGER.isErrorEnabled()) + if(LOGGER.isErrorEnabled()) LOGGER.error("Exception creating URL with href " + _pagerModel.getPageHref() + " action " + _pagerModel.getPageAction(), mue); throw new CellDecoratorException("An exception occurred creating an URL while decorating an Anchor", mue); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/FirstPreviousNextLastPagerRenderer.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/FirstPreviousNextLastPagerRenderer.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/FirstPreviousNextLastPagerRenderer.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/FirstPreviousNextLastPagerRenderer.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/FirstPreviousNextLastPagerRenderer.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/FirstPreviousNextLastPagerRenderer.java Wed Jan 19 11:00:31 2005 @@ -24,15 +24,13 @@ * */ public class FirstPreviousNextLastPagerRenderer - extends AbstractPagerRenderer -{ - public FirstPreviousNextLastPagerRenderer(DataGridModel gridModel) - { + extends AbstractPagerRenderer { + + public FirstPreviousNextLastPagerRenderer(DataGridModel gridModel) { super(gridModel); } - protected String internalRender() - { + protected String internalRender() { StringBuilder buf = new StringBuilder(); PagerModel pagerModel = getPagerModel(); int currentPage = pagerModel.getPage(); @@ -40,26 +38,30 @@ /* Page # of # First / Previous Next / Last */ buf.append(getDataGridModel().getString("Tags_DataGrid_pageOfPages", - new Integer[] {currentPage+1, pagerModel.getLastPage()+1})); + new Integer[]{currentPage + 1, pagerModel.getLastPage() + 1})); buf.append(" "); if(currentPage > PagerModel.FIRST_PAGE) buf.append(buildLiveFirstLink()); - else buf.append(buildDeadFirstLink()); + else + buf.append(buildDeadFirstLink()); buf.append(" / "); if(pagerModel.getPreviousPage() >= 0) buf.append(buildLivePreviousLink()); - else buf.append(buildDeadPreviousLink()); + else + buf.append(buildDeadPreviousLink()); buf.append(" "); if(pagerModel.getNextPage() <= lastPage) buf.append(buildLiveNextPageLink()); - else buf.append(buildDeadNextLink()); + else + buf.append(buildDeadNextLink()); buf.append(" / "); if(currentPage < lastPage) buf.append(buildLiveLastLink()); - else buf.append(buildDeadLastLink()); + else + buf.append(buildDeadLastLink()); return buf.toString(); } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/IPagerRenderer.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/IPagerRenderer.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/IPagerRenderer.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/IPagerRenderer.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/IPagerRenderer.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/IPagerRenderer.java Wed Jan 19 11:00:31 2005 @@ -20,7 +20,7 @@ /** * */ -public interface IPagerRenderer -{ +public interface IPagerRenderer { + public String render(); } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PreviousNextPagerRenderer.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PreviousNextPagerRenderer.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PreviousNextPagerRenderer.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PreviousNextPagerRenderer.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PreviousNextPagerRenderer.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PreviousNextPagerRenderer.java Wed Jan 19 11:00:31 2005 @@ -21,22 +21,20 @@ import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel; public class PreviousNextPagerRenderer - extends AbstractPagerRenderer -{ - public PreviousNextPagerRenderer(DataGridModel gridModel) - { + extends AbstractPagerRenderer { + + public PreviousNextPagerRenderer(DataGridModel gridModel) { super(gridModel); } - protected String internalRender() - { + protected String internalRender() { StringBuilder buf = new StringBuilder(); PagerModel pagerModel = getPagerModel(); int currentPage = pagerModel.getPage(); int lastPage = pagerModel.getLastPage(); buf.append(getDataGridModel().getString("Tags_DataGrid_pageOfPages", - new Integer[] {currentPage+1, pagerModel.getLastPage()+1})); + new Integer[]{currentPage + 1, pagerModel.getLastPage() + 1})); buf.append(" "); if(pagerModel.getPreviousPage() >= 0) buf.append(buildLivePreviousLink()); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/table/TableRenderer.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/table/TableRenderer.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/table/TableRenderer.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/table/TableRenderer.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/table/TableRenderer.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/table/TableRenderer.java Wed Jan 19 11:00:31 2005 @@ -32,8 +32,8 @@ /** * */ -public class TableRenderer -{ +public class TableRenderer { + private static final CaptionTag.State CAPTION_STATE = new CaptionTag.State(); private static final THeadTag.State THEAD_STATE = new THeadTag.State(); private static final TableTag.State TABLE_STATE = new TableTag.State(); @@ -47,8 +47,7 @@ private TagRenderingBase _thRenderer = null; private StylePolicy _stylePolicy = null; - public TableRenderer(HttpServletRequest request, StylePolicy stylePolicy) - { + public TableRenderer(HttpServletRequest request, StylePolicy stylePolicy) { super(); _stylePolicy = stylePolicy; _tableRenderer = TagRenderingBase.Factory.getRendering(TagRenderingBase.TABLE_TAG, request); @@ -59,8 +58,7 @@ _tdRenderer = TagRenderingBase.Factory.getRendering(TagRenderingBase.TD_TAG, request); } - public void openTable(TableTag.State state, AbstractRenderAppender appender) - { + public void openTable(TableTag.State state, AbstractRenderAppender appender) { if(state == null) state = new TableTag.State(); @@ -71,27 +69,23 @@ appender.append("\n"); } - public void closeTable(AbstractRenderAppender appender) - { + public void closeTable(AbstractRenderAppender appender) { _tableRenderer.doEndTag(appender); appender.append("\n"); appender.append("\n"); } - public void openCaption(AbstractRenderAppender appender) - { + public void openCaption(AbstractRenderAppender appender) { appender.append("\n"); _captionRenderer.doStartTag(appender, CAPTION_STATE); } - public void closeCaption(AbstractRenderAppender appender) - { + public void closeCaption(AbstractRenderAppender appender) { _captionRenderer.doEndTag(appender); appender.append("\n"); } - public final void openHeaderRow(TrTag.State state, AbstractRenderAppender appender) - { + public final void openHeaderRow(TrTag.State state, AbstractRenderAppender appender) { if(state == null) state = new TrTag.State(); @@ -104,28 +98,24 @@ _trRenderer.doStartTag(appender, state); } - public void closeHeaderRow(AbstractRenderAppender appender) - { + public void closeHeaderRow(AbstractRenderAppender appender) { appender.append("\n"); _trRenderer.doEndTag(appender); _theadRenderer.doEndTag(appender); appender.append("\n"); } - public void openTableRow(TrTag.State state, AbstractRenderAppender appender) - { + public void openTableRow(TrTag.State state, AbstractRenderAppender appender) { appender.append("\n"); _trRenderer.doStartTag(appender, state); } - public void closeTableRow(AbstractRenderAppender appender) - { + public void closeTableRow(AbstractRenderAppender appender) { appender.append("\n"); _trRenderer.doEndTag(appender); } - public void openFooterRow(TrTag.State state, AbstractRenderAppender appender) - { + public void openFooterRow(TrTag.State state, AbstractRenderAppender appender) { if(state == null) state = new TrTag.State(); @@ -136,30 +126,25 @@ _trRenderer.doStartTag(appender, state); } - public void closeFooterRow(AbstractRenderAppender appender) - { + public void closeFooterRow(AbstractRenderAppender appender) { appender.append("\n"); _trRenderer.doEndTag(appender); } - public void openHeaderCell(ThTag.State state, AbstractRenderAppender appender) - { + public void openHeaderCell(ThTag.State state, AbstractRenderAppender appender) { _thRenderer.doStartTag(appender, state); } - public void closeHeaderCell(AbstractRenderAppender appender) - { + public void closeHeaderCell(AbstractRenderAppender appender) { _thRenderer.doEndTag(appender); appender.append("\n"); } - public void openTableCell(TdTag.State state, AbstractRenderAppender appender) - { + public void openTableCell(TdTag.State state, AbstractRenderAppender appender) { _tdRenderer.doStartTag(appender, state); } - public void closeTableCell(AbstractRenderAppender appender) - { + public void closeTableCell(AbstractRenderAppender appender) { _tdRenderer.doEndTag(appender); } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java Wed Jan 19 11:00:31 2005 @@ -122,6 +122,7 @@ return buildSortQueryParamsMap(sortExpression, SortDirection.DESCENDING); else if(sortDirection == SortDirection.DESCENDING) return buildSortQueryParamsMap(sortExpression, SortDirection.NONE); - else throw new IllegalStateException("Received invalid sort direction \"" + sortDirection + "\""); + else + throw new IllegalStateException("Received invalid sort direction \"" + sortDirection + "\""); } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/FilterService.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/FilterService.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/FilterService.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/FilterService.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/FilterService.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/FilterService.java Wed Jan 19 11:00:31 2005 @@ -30,23 +30,22 @@ import org.apache.beehive.netui.util.logging.Logger; /* Beehive filter format: netui_filter=<namespace>~<filterExpr>~<op>~<value> */ + /** * */ -public class FilterService -{ +public class FilterService { + private static final Logger LOGGER = Logger.getInstance(FilterService.class); private static final String FILTER_DELIM = "~"; - public static FilterService getInstance(JspContext jspContext, String namespace) - { - if(jspContext instanceof PageContext) - { + public static FilterService getInstance(JspContext jspContext, String namespace) { + if(jspContext instanceof PageContext) { ServletRequest request = ((PageContext)jspContext).getRequest(); return getInstance(request, namespace); - } - else throw new IllegalArgumentException("Can not create a FilterService from a JspContext of type " + - (jspContext != null ? jspContext.getClass().getName() : "null")); + } else + throw new IllegalArgumentException("Can not create a FilterService from a JspContext of type " + + (jspContext != null ? jspContext.getClass().getName() : "null")); } public static FilterService getInstance(ServletRequest request, String namespace) { @@ -57,8 +56,7 @@ private HashMap<String, List<IFilter>> _filters = null; private ServletRequest _request = null; - private FilterService(ServletRequest request, String namespace) - { + private FilterService(ServletRequest request, String namespace) { super(); _request = request; _namespace = namespace; @@ -69,19 +67,16 @@ return _filters; } - private HashMap<String, List<IFilter>> internalGetFilters() - { + private HashMap<String, List<IFilter>> internalGetFilters() { String[] filters = _request.getParameterValues(IFilter.FILTER_PARAM_KEY); return createFilters(_namespace, filters); } - private static final HashMap<String, List<IFilter>> createFilters(String namespace, String[] queryParams) - { + private static final HashMap<String, List<IFilter>> createFilters(String namespace, String[] queryParams) { if(queryParams == null) return null; - + HashMap<String, List<IFilter>> map = new HashMap<String, List<IFilter>>(); - for(int i = 0; i < queryParams.length; i++) - { + for(int i = 0; i < queryParams.length; i++) { /* todo: need to make this pluggable */ if(!queryParams[i].startsWith(namespace + "~")) continue; @@ -91,12 +86,11 @@ assert f != null; List<IFilter> list = map.get(f.getFilterExpression()); - if(list == null) - { + if(list == null) { list = new ArrayList<IFilter>(); map.put(f.getFilterExpression(), list); } - + list.add(f); } @@ -106,26 +100,26 @@ private static final IFilter parse(String namespace, String filter) { /* todo: need to figure out how to handle this case */ - if (!filter.startsWith(namespace)) + if(!filter.startsWith(namespace)) return null; // crack filter terms here String[] terms = filter.split(FILTER_DELIM); /* todo: what did this mean? */ - if (terms.length == 3 && terms[2].equals("*")) + if(terms.length == 3 && terms[2].equals("*")) return null; - else if (terms.length == 4) { + else if(terms.length == 4) { try { // the namespace is ignored here since all filter terms are scoped into a namespace already DefaultFilter f = new DefaultFilter(terms[1], terms[2], terms[3]); return f; - } catch (NumberFormatException nfe) { - if (LOGGER.isErrorEnabled()) + } catch(NumberFormatException nfe) { + if(LOGGER.isErrorEnabled()) LOGGER.error("An error occurred parsing a URL filter with syntax \"" + filter + "\"."); throw new IllegalFilterException("An exception occurred parsing the filter \"" + filter + "\". Cause: " + nfe, nfe); } - } - else throw new IllegalFilterException("The syntax of the filter \"" + filter + "\" is illegal."); + } else + throw new IllegalFilterException("The syntax of the filter \"" + filter + "\" is illegal."); } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/IllegalFilterException.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/IllegalFilterException.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/IllegalFilterException.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/IllegalFilterException.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/IllegalFilterException.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/IllegalFilterException.java Wed Jan 19 11:00:31 2005 @@ -21,41 +21,34 @@ * */ public class IllegalFilterException - extends RuntimeException -{ - /** + extends RuntimeException { + + /** * - */ - public IllegalFilterException() - { + */ + public IllegalFilterException() { super(); } - /** - * - * @param message - */ - public IllegalFilterException(String message) - { + /** + * @param message + */ + public IllegalFilterException(String message) { super(message); } - /** - * - * @param cause - */ - public IllegalFilterException(Throwable cause) - { + /** + * @param cause + */ + public IllegalFilterException(Throwable cause) { super(cause); } - /** - * - * @param message - * @param cause - */ - public IllegalFilterException(String message, Throwable cause) - { + /** + * @param message + * @param cause + */ + public IllegalFilterException(String message, Throwable cause) { super(message, cause); } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/pager/PagerService.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/pager/PagerService.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/pager/PagerService.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/pager/PagerService.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/pager/PagerService.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/pager/PagerService.java Wed Jan 19 11:00:31 2005 @@ -27,6 +27,7 @@ * */ public class PagerService { + private static final Logger LOGGER = Logger.getInstance(PagerService.class); public static final String DEFAULT_PAGE_SIZE_PARAM_NAME = "netui_pagesize"; @@ -34,12 +35,12 @@ public static final String DELIM = "~"; public static final PagerService getInstance(JspContext jspContext, String namespace) { - if (jspContext instanceof PageContext) { - ServletRequest servletRequest = ((PageContext) jspContext).getRequest(); + if(jspContext instanceof PageContext) { + ServletRequest servletRequest = ((PageContext)jspContext).getRequest(); return getInstance(servletRequest, namespace); - } - else throw new IllegalArgumentException("Can not create a PagerService from a JspContext of type " + - (jspContext != null ? jspContext.getClass().getName() : "null")); + } else + throw new IllegalArgumentException("Can not create a PagerService from a JspContext of type " + + (jspContext != null ? jspContext.getClass().getName() : "null")); } public static final PagerService getInstance(ServletRequest servletRequest, String namespace) { @@ -66,7 +67,7 @@ public Integer getCurrentPage() { if(getCurrentRow() != null && getPageSize() != null) _currentPage = (int)Math.ceil(getCurrentRow().doubleValue() / getPageSize().doubleValue()); - + return _currentPage; } @@ -81,18 +82,18 @@ String[] params = _request.getParameterValues(gridParamKey); Integer value = null; - if (LOGGER.isDebugEnabled()) + if(LOGGER.isDebugEnabled()) LOGGER.debug("found " + (params != null ? "" + params.length : "null") + " parameters for key " + gridParamKey); - if (params != null) { + if(params != null) { String prefix = _namespace + DELIM; - if (LOGGER.isDebugEnabled()) + if(LOGGER.isDebugEnabled()) LOGGER.debug("search for prefix: " + prefix); - for (int i = 0; i < params.length; i++) { - if (params[i].startsWith(prefix)) { - if (LOGGER.isDebugEnabled()) + for(int i = 0; i < params.length; i++) { + if(params[i].startsWith(prefix)) { + if(LOGGER.isDebugEnabled()) LOGGER.debug("found page query param: " + params[i]); String intString = null; @@ -100,8 +101,8 @@ intString = params[i].substring(prefix.length()); value = new Integer(intString); - } catch (NumberFormatException nfe) { - if (LOGGER.isErrorEnabled()) + } catch(NumberFormatException nfe) { + if(LOGGER.isErrorEnabled()) LOGGER.error("Invalid current page value \"" + intString + "\". Cause: " + nfe, nfe); } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortFactory.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortFactory.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortFactory.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortFactory.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortFactory.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortFactory.java Wed Jan 19 11:00:31 2005 @@ -27,7 +27,8 @@ public class SortFactory { /* do not construct */ - private SortFactory() {} + private SortFactory() { + } public static final ISort getInstance(String sortExpression, SortDirection sortDirection) { return new DefaultSort(sortExpression, sortDirection); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortService.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortService.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortService.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortService.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortService.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortService.java Wed Jan 19 11:00:31 2005 @@ -36,7 +36,7 @@ public static final SortService getInstance(ServletRequest request, String namespace) { assert request != null; assert namespace != null && !namespace.equals(""); - + return new SortService(request, namespace); } @@ -59,26 +59,27 @@ private ArrayList<ISort> parseTerms(ServletRequest request, String namespace) { String[] params = request.getParameterValues(ISort.SORT_PARAM_KEY); - if (params == null) + if(params == null) return null; String namespacePrefix = namespace + SORT_DELIM; ArrayList<ISort> sorts = new ArrayList<ISort>(); - for (int i = 0; i < params.length; i++) { + for(int i = 0; i < params.length; i++) { String param = params[i]; - if (param.startsWith(namespacePrefix)) { + if(param.startsWith(namespacePrefix)) { String[] terms = param.split(SORT_DELIM); assert terms != null && terms.length == 2; String[] cols = terms[1].split(SORT_TERM_DELIM); - for (int j = 0; j < cols.length; j++) { + for(int j = 0; j < cols.length; j++) { String t = cols[j]; SortDirection sortDirection = SortDirection.NONE; if(cols[j].startsWith("-")) sortDirection = SortDirection.DESCENDING; - else sortDirection = SortDirection.ASCENDING; + else + sortDirection = SortDirection.ASCENDING; String sortExpression = (sortDirection == SortDirection.DESCENDING ? cols[j].substring(1) : cols[j]); ISort sort = new DefaultSort(sortExpression, sortDirection); sorts.add(sort); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/JspUtil.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/JspUtil.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/JspUtil.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/JspUtil.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/JspUtil.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/JspUtil.java Wed Jan 19 11:00:31 2005 @@ -28,33 +28,31 @@ import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils; import org.apache.beehive.netui.tags.internal.PageFlowTagUtils; -public class JspUtil -{ +public class JspUtil { + /* do not construct */ - private JspUtil() {} + private JspUtil() { + } - public static final HttpServletRequest getRequest(JspContext jspContext) - { + public static final HttpServletRequest getRequest(JspContext jspContext) { PageContext pageContext = getPageContext(jspContext); return (HttpServletRequest)pageContext.getRequest(); } - public static final PageContext getPageContext(JspContext jspContext) - { + public static final PageContext getPageContext(JspContext jspContext) { if(!(jspContext instanceof PageContext)) throw new IllegalStateException("Can not create a PageContext from a JspContext of type: " + - (jspContext != null ? jspContext.getClass().getName() : "null")); - else return (PageContext)jspContext; + (jspContext != null ? jspContext.getClass().getName() : "null")); + else + return (PageContext)jspContext; } public static final String createURL(String href, String action, String location, String scope, Map params, JspContext jspContext) - throws URISyntaxException - { + throws URISyntaxException { PageContext pageContext = getPageContext(jspContext); /* add the jpfScopeID parameter, if the scope attribute is present. */ - if(scope != null) - { + if(scope != null) { if(params == null) params = new HashMap(); @@ -67,13 +65,15 @@ uri = PageFlowTagUtils.rewriteActionURL(pageContext, action, params, location); else if(href != null) uri = PageFlowTagUtils.rewriteHrefURL(pageContext, href, params, location); - else return ((HttpServletRequest)pageContext.getRequest()).getPathTranslated(); + else + return ((HttpServletRequest)pageContext.getRequest()).getPathTranslated(); assert uri != null; /* todo: shouldn't this also be a call to response.encodeURL(uri.toString()) for session ID? */ - if (uri.isAbsolute()) + if(uri.isAbsolute()) return uri.toXMLString(); - else return uri.toString(); + else + return uri.toString(); } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java Wed Jan 19 11:00:31 2005 @@ -27,8 +27,8 @@ * */ public class PagedDataSet - implements Iterator -{ + implements Iterator { + private Logger LOGGER = Logger.getInstance(PagedDataSet.class); private boolean _advancedToPage = false; @@ -43,20 +43,19 @@ private Object _currentItem = null; private String _dataSource = null; - public PagedDataSet(String dataSource, Iterator iterator) - { + public PagedDataSet(String dataSource, Iterator iterator) { _dataSource = dataSource; if(iterator == null) _dataSetIterator = Collections.EMPTY_LIST.iterator(); - else _dataSetIterator = iterator; + else + _dataSetIterator = iterator; if(LOGGER.isDebugEnabled()) LOGGER.debug("iterator type: " + _dataSetIterator.getClass().getName()); _list = new ArrayList(); - while(_dataSetIterator.hasNext()) - { + while(_dataSetIterator.hasNext()) { _list.add(_dataSetIterator.next()); _dataSetSize++; if(LOGGER.isDebugEnabled()) @@ -65,36 +64,29 @@ _dataSetIterator = _list.iterator(); } - public void createWindow(int startWindow, int endWindow) - { + public void createWindow(int startWindow, int endWindow) { _startWindow = startWindow; _endWindow = endWindow; } - public boolean hasNext() - { - if(!_advancedToPage && _startWindow > -1) - { + public boolean hasNext() { + if(!_advancedToPage && _startWindow > -1) { assert _currentIndex == 0; - while(_dataSetIterator.hasNext() && _currentIndex != _startWindow) - { + while(_dataSetIterator.hasNext() && _currentIndex != _startWindow) { _dataSetIterator.next(); _currentIndex++; } _advancedToPage = true; - } - else if(_endWindow > -1 && (_currentIndex >= _endWindow)) - { + } else if(_endWindow > -1 && (_currentIndex >= _endWindow)) { if(LOGGER.isDebugEnabled()) LOGGER.debug("current index: " + _currentIndex + " _endRenderWindiw: " + - _endWindow + " end data set: " + (_currentIndex >= _endWindow)); + _endWindow + " end data set: " + (_currentIndex >= _endWindow)); return false; } boolean hasNext = _dataSetIterator.hasNext(); - if(!hasNext) - { + if(!hasNext) { _currentIndex = -1; _currentItem = null; } @@ -102,35 +94,29 @@ return hasNext; } - public Object next() - { + public Object next() { _currentItem = _dataSetIterator.next(); _currentIndex++; return _currentItem; } - public void remove() - { + public void remove() { throw new UnsupportedOperationException(); } - public String getDataSource() - { + public String getDataSource() { return _dataSource; } - public int getSize() - { + public int getSize() { return _dataSetSize; } - public int getCurrentIndex() - { + public int getCurrentIndex() { return _currentIndex; } - public Object getCurrentItem() - { + public Object getCurrentItem() { return _currentItem; } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/ParameterUtil.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/ParameterUtil.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/ParameterUtil.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/ParameterUtil.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/ParameterUtil.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/ParameterUtil.java Wed Jan 19 11:00:31 2005 @@ -30,20 +30,23 @@ */ public class ParameterUtil { - private ParameterUtil() {} + private ParameterUtil() { + } public static final Map getParameters(ServletRequest request, String omitKey) { - Map queryParams = null; - if(request instanceof HttpServletRequest) + Map queryParams = null; + if(request instanceof HttpServletRequest) queryParams = ((HttpServletRequest)request).getParameterMap(); - else throw new IllegalArgumentException("Unable to create ParameterUtil from request of type \" + request.getClass().getName()"); + else + throw new IllegalArgumentException("Unable to create ParameterUtil from request of type \" + request.getClass().getName()"); HashMap map = new HashMap(); for(Object key : queryParams.keySet()) { if(key.equals(omitKey)) continue; - else map.put(key, queryParams.get(key)); + else + map.put(key, queryParams.get(key)); } return map; Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/StructuredBaseTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/StructuredBaseTag.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/StructuredBaseTag.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/StructuredBaseTag.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/StructuredBaseTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/StructuredBaseTag.java Wed Jan 19 11:00:31 2005 @@ -31,7 +31,7 @@ * and @see org.apache.beehive.netui.tags.databinding.grid.Grid tags. * <br/> * <br/> - * This tag provides commonly used features such as buffering of content, a simple + * This tag provides commonly used features such as buffering of content, a simple * mechanism for verifying a tag's parent structure, and verifying the attributes * set on a tag instance. * <br/> @@ -39,34 +39,33 @@ * Tags that extend this base class participate in sometimes complex rendering * cycles of repeating tags. As a result, as the containing tag evalutes its * body, it treats the lifecycle of this evaluation as a state machine. The - * direct child tags which extend this class often need to know the state of the + * direct child tags which extend this class often need to know the state of the * parent tag. There are two convenience methods that are invoked by this - * tag's @see doStartTag() and @see doEndTag methods that pass the current + * tag's @see doStartTag() and @see doEndTag methods that pass the current * state of the parent to the child tags. The @see renderStartTag and @see renderEndTag * can return any values that the @see javax.servlet.jsp.tagext.TagSupport#doStartTag(int) * and the @see javax.servlet.jsp.tagext.TagSupport#doEndTag(int) calls can - * return. - * + * return. + * * @exclude */ public abstract class StructuredBaseTag - extends AbstractClassicTag -{ - private static final Logger _logger = Logger.getInstance(StructuredBaseTag.class); + extends AbstractClassicTag { + + private static final Logger LOGGER = Logger.getInstance(StructuredBaseTag.class); protected static final String EMPTY_STRING = ""; - + private StringBuilder _contentBuffer = null; /** * Add content to the content that is being buffered by this tag. All tags write their body - * content to this content buffer, which is rendered at the end of the tag's lifecycle if + * content to this content buffer, which is rendered at the end of the tag's lifecycle if * no fatal errors have occurred during this tag's lifecycle. * * @param content content that this tag should render. */ - public void addContent(String content) - { + public void addContent(String content) { if(_contentBuffer == null) _contentBuffer = new StringBuilder(512); @@ -78,15 +77,15 @@ * * @return the content String if there is content; null otherwise */ - public String getContent() - { + public String getContent() { if(_contentBuffer != null) return _contentBuffer.toString(); - else return null; + else + return null; } /** - * Starts a tag's lifecycle. This method performs several operations before + * Starts a tag's lifecycle. This method performs several operations before * invoking the @see renderStartTag(int) method. In order, these stages are: * <ol> * <li>@see verifyStructure()</li> @@ -95,28 +94,25 @@ * <li>@see renderStartTag(int)</li> * </ol> * The benefit of this lifecycle is that it provides a structure for component - * tags that are immediately nested inside of repeating tags. + * tags that are immediately nested inside of repeating tags. * <br/> * <br/> * Any errors that occur before calling @see renderStartTag(int) are reported - * in the page. + * in the page. * - * @return the value returned from calling @see renderStartTag(int), which can be - * any value that can be returned from the @see javax.servlet.jsp.tagext.TagSupport - * class. If an error occurs, the tag returns SKIP_BODY. + * @return the value returned from calling @see renderStartTag(int), which can be + * any value that can be returned from the @see javax.servlet.jsp.tagext.TagSupport + * class. If an error occurs, the tag returns SKIP_BODY. */ public int doStartTag() - throws JspException - { + throws JspException { int ret = SKIP_BODY; - try - { + try { verifyStructure(); - if(_logger.isDebugEnabled()) _logger.debug("verifyStructure: hasErrors=" + hasErrors()); + if(LOGGER.isDebugEnabled()) LOGGER.debug("verifyStructure: hasErrors=" + hasErrors()); - if (hasErrors()) - { + if(hasErrors()) { reportErrors(); return SKIP_BODY; } @@ -125,59 +121,51 @@ verifyAttributes(); - if(_logger.isDebugEnabled()) _logger.debug("verifyAttributes: hasErrors=" + hasErrors()); + if(LOGGER.isDebugEnabled()) LOGGER.debug("verifyAttributes: hasErrors=" + hasErrors()); - if (hasErrors()) - { + if(hasErrors()) { reportErrors(); return SKIP_BODY; } int state = getCurrentRenderState(); - + ret = renderStartTag(state); - } - catch(Exception e) - { - String msg = Bundle.getString("Tags_StructuredBaseTag_startTagError", new Object[] {getTagName(), e}); + } catch(Exception e) { + String msg = Bundle.getString("Tags_StructuredBaseTag_startTagError", new Object[]{getTagName(), e}); - if(_logger.isErrorEnabled()) _logger.error("An error occurred rendering the startTag of the tag \"" + getTagName() + "\". Cause: " + e, e); + if(LOGGER.isErrorEnabled()) LOGGER.error("An error occurred rendering the startTag of the tag \"" + getTagName() + "\". Cause: " + e, e); - registerTagError(msg,e); + registerTagError(msg, e); reportErrors(); return SKIP_BODY; } - + return ret; } /** * Ends a tag's lifecycle. This call is a wrapper around the @see renderEndTag(int) call * that allows a tag directly contained in a repeating tag to act based on the state - * of the parent. + * of the parent. * * @return EVAL_PAGE * @throws JspException if an error that occurred that could not be reported to the page */ public int doEndTag() - throws JspException - { - if(hasErrors()) - { + throws JspException { + if(hasErrors()) { localRelease(); return EVAL_PAGE; } - + int ret = EVAL_PAGE; - try - { + try { int state = getCurrentRenderState(); ret = renderEndTag(state); - } - catch(Exception e) - { - String msg = Bundle.getString("Tags_StructuredBaseTag_endTagError", new Object[] {getTagName(), e.toString()}); - registerTagError(msg,e); + } catch(Exception e) { + String msg = Bundle.getString("Tags_StructuredBaseTag_endTagError", new Object[]{getTagName(), e.toString()}); + registerTagError(msg, e); reportErrors(); ret = EVAL_PAGE; } @@ -189,8 +177,7 @@ /** * Reset all of the fields of this tag. */ - protected void localRelease() - { + protected void localRelease() { super.localRelease(); _contentBuffer = null; } @@ -198,32 +185,31 @@ protected abstract int getCurrentRenderState(); protected abstract int renderStartTag(int state) throws JspException; - + protected abstract int renderEndTag(int state) throws JspException; protected abstract Class getValidContainerType(); - - protected void prepare() throws JspException {} - - protected void verifyAttributes() throws JspException {} - - private final void verifyStructure() - throws JspException - { + + protected void prepare() throws JspException { + } + + protected void verifyAttributes() throws JspException { + } + + private final void verifyStructure() + throws JspException { Tag parent = getParent(); Class validContainer = getValidContainerType(); if((validContainer != null && parent == null) || - validContainer != null && !validContainer.isAssignableFrom(parent.getClass())) - { - if(_logger.isErrorEnabled()) - { + validContainer != null && !validContainer.isAssignableFrom(parent.getClass())) { + if(LOGGER.isErrorEnabled()) { String msg = "A tag of type \"" + getClass().getName() + "\" must be nested within a tag of type \"" + getValidContainerType().getName() + "\""; - _logger.error(msg); + LOGGER.error(msg); } - String msg = Bundle.getString("Tags_StructuredBaseTag_invalidParent", new Object[] {getClass().getName(), getValidContainerType().getName()}); - registerTagError(msg,null); + String msg = Bundle.getString("Tags_StructuredBaseTag_invalidParent", new Object[]{getClass().getName(), getValidContainerType().getName()}); + registerTagError(msg, null); } - } + } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/style/AbstractStyleBean.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/style/AbstractStyleBean.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/style/AbstractStyleBean.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/style/AbstractStyleBean.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/style/AbstractStyleBean.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/style/AbstractStyleBean.java Wed Jan 19 11:00:31 2005 @@ -23,11 +23,11 @@ * can be extended to add additional style information. * <br/> * <br/> - * Two basic methods are provided for rendering table and row styles into a + * Two basic methods are provided for rendering table and row styles into a * [EMAIL PROTECTED] StringBuilder}. */ -public abstract class AbstractStyleBean -{ +public abstract class AbstractStyleBean { + private static final String EMPTY_STRING = ""; private String _tableClass = null; @@ -38,8 +38,7 @@ * * @param tableClass the table style class */ - public void setTableClass(String tableClass) - { + public void setTableClass(String tableClass) { _tableClass = tableClass; } @@ -48,18 +47,16 @@ * * @return the row style class or <code>null</code> if none is set */ - public String getTableClass() - { + public String getTableClass() { return _tableClass; } - + /** * Set the table row style class. * * @param rowClass the table row style class */ - public void setRowClass(String rowClass) - { + public void setRowClass(String rowClass) { _rowClass = rowClass; } @@ -68,32 +65,29 @@ * * @return the row style class or <code>null</code> if none is set */ - public String getRowClass() - { + public String getRowClass() { return _rowClass; } /** - * A method that will render the style class into the + * A method that will render the style class into the * [EMAIL PROTECTED] StringBuilder}. */ - public String renderTableStyle() - { + public String renderTableStyle() { return renderStyle(getTableClass()); } /** - * A method that will render the style class into the + * A method that will render the style class into the * [EMAIL PROTECTED] StringBuilder}. */ - public String renderRowStyle() - { + public String renderRowStyle() { return renderStyle(getRowClass()); } /** * Render the style class into the [EMAIL PROTECTED] StringBuilder}. If the - * style class <code>style</code> is not null, it is appended into the + * style class <code>style</code> is not null, it is appended into the * StringBuilder with the HTML tag attribute "class". A space is inserted * at the front of the attribute but not at the end, so a <code>style</code> * value of "foo" will render as: @@ -103,8 +97,7 @@ * * @param style the value of the style class */ - protected String renderStyle(String style) - { + protected String renderStyle(String style) { if(style == null) return EMPTY_STRING; StringBuilder buf = new StringBuilder(); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/bundle/DeclareBundle.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/bundle/DeclareBundle.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/bundle/DeclareBundle.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/bundle/DeclareBundle.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/bundle/DeclareBundle.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/bundle/DeclareBundle.java Wed Jan 19 11:00:31 2005 @@ -44,16 +44,16 @@ * in a classpath that is available to the web application. Often, they are stored in * <code>WEB-INF/classes</code>. If the properties file contains a key called <code>helloWorld</code>, * then the expression <code>{bundle.someMessages.helloWorld}</code> - * would be look-up the message matching the Locale specified on the tag. Bundle binding expressions can be + * would be look-up the message matching the Locale specified on the tag. Bundle binding expressions can be * used in any expression bindable NetUI tag attribute.</p> * <p>Note, the name <code>default</code> is a bundle identifier that is reserved for use by the * DeclareBundle tag. If this value is used for the <code>name</code> attribute on a DeclareBundle tag, * an error will be reported in the page. The <code>default</code> bundle is reserved for use when * accessing internationalized messages from the "current" Struts module's default properties file.</p> * <p>This tag provides a high level of customizability for rendering internationalized messages. - * Specifically, the [EMAIL PROTECTED] Locale} for which to look-up messages can be specified on the DeclareBundle + * Specifically, the [EMAIL PROTECTED] Locale} for which to look-up messages can be specified on the DeclareBundle * tag. By default, the Locale for the current request is used, but this Locale can be overridden by - * setting the <code>language</code>, <code>country</code>, and <code>variant</code> tag attributes + * setting the <code>language</code>, <code>country</code>, and <code>variant</code> tag attributes * as necessary. See [EMAIL PROTECTED] Locale} for more information on the possible values for these attributes.</p> * <p>The Locale can be overridden by setting these attributes in three combinations:</p> * <ul> @@ -62,60 +62,58 @@ * <li>country</li> * </ul> * <p>Any other combinations will throw an exception.</p> - - * - * @jsptagref.tagdescription - * <p>Declares a [EMAIL PROTECTED] java.util.ResourceBundle java.util.ResourceBundle} - * as a source for displaying internationalized messages. + * + * @jsptagref.tagdescription <p>Declares a [EMAIL PROTECTED] java.util.ResourceBundle java.util.ResourceBundle} + * as a source for displaying internationalized messages. * The declared resource bundle is accessible - * using the <code>{bundle...}</code> data binding context. + * using the <code>{bundle...}</code> data binding context. * The required <code>name</code> attribute specifies * the identifier used to refer to the ResourceBundle in an expression. For example:</p> - * + * <p/> * <pre> <netui-data:declareBundle name="someMessages" bundlePath="com/foobar/resources/WebAppMessages"/></pre> - * + * <p/> * <p>This tag declares a bundle that is referenced in a data binding expression as * <code>{bundle.someMessages}</code>.</p> - * - * <p>The bundle that is referenced depends on the <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/Locale.html"; target="_blank">java.util.Locale</a> - * specified. The resource bundle properties files that are accessed are located - * in the package <code>com/foobar/resources</code> with the root properties file - * name of <code>WebAppMessages</code>. The naming conventions for properties can - * be found in Sun's Java documentation at <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/ResourceBundle.html#getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader)" target="_blank">ResourceBundle.getBundle(String, - * Locale, ClassLoader)</a> . These files must be located in a classpath that is - * available to the web application. Often, they are stored in <code>WEB-INF/classes</code>. - * If the properties file contains a key called <code>helloWorld</code>, then the - * expression <code>{bundle.someMessages.helloWorld}</code> would look-up the message - * matching the Locale specified on the tag. Bundle binding expressions can be - * used in any data bindable <netui...> tag attribute.</p> - * <p>It is possible to have keys that contain multiple words separated by spaces, - * commas, or periods. If this is the case, then you must use slightly different - * syntax to reference those keys in your data binding statement. The following - * list illustrates three ways to access the key <code>My helloWorld</code> from the <code>someMessages</code> - * property file:</p> + * <p/> + * <p>The bundle that is referenced depends on the <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/Locale.html"; target="_blank">java.util.Locale</a> + * specified. The resource bundle properties files that are accessed are located + * in the package <code>com/foobar/resources</code> with the root properties file + * name of <code>WebAppMessages</code>. The naming conventions for properties can + * be found in Sun's Java documentation at <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/ResourceBundle.html#getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader)" target="_blank">ResourceBundle.getBundle(String, + * Locale, ClassLoader)</a> . These files must be located in a classpath that is + * available to the web application. Often, they are stored in <code>WEB-INF/classes</code>. + * If the properties file contains a key called <code>helloWorld</code>, then the + * expression <code>{bundle.someMessages.helloWorld}</code> would look-up the message + * matching the Locale specified on the tag. Bundle binding expressions can be + * used in any data bindable <netui...> tag attribute.</p> + * <p>It is possible to have keys that contain multiple words separated by spaces, + * commas, or periods. If this is the case, then you must use slightly different + * syntax to reference those keys in your data binding statement. The following + * list illustrates three ways to access the key <code>My helloWorld</code> from the <code>someMessages</code> + * property file:</p> * <ul> - * <li><code><netui:label value="{bundle.someMessages['My helloWorld']}"/></code> - * </li> - * <li><code><netui:label value='{bundle.someMessages["My helloWorld"]}'/></code> - * </li> - * <li><code><netui:label value="{bundle.someMessages[\"My helloWorld\"]}"/></code><br> - * </li> + * <li><code><netui:label value="{bundle.someMessages['My helloWorld']}"/></code> + * </li> + * <li><code><netui:label value='{bundle.someMessages["My helloWorld"]}'/></code> + * </li> + * <li><code><netui:label value="{bundle.someMessages[\"My helloWorld\"]}"/></code><br> + * </li> * </ul> - * <p>WebLogic Workshop automatically generates the last example listed above when - * you set the label control in the property editor to <code>bundle.someMessages["My - * helloWorld"]</code>. In all three cases, you WebLogic Workshop can successfully - * retrieve the multi-word key.</p> + * <p>WebLogic Workshop automatically generates the last example listed above when + * you set the label control in the property editor to <code>bundle.someMessages["My + * helloWorld"]</code>. In all three cases, you WebLogic Workshop can successfully + * retrieve the multi-word key.</p> * <p><b>Note:</b> the name <code>default</code> is a bundle identifier that is reserved for use by the - * <netui-data:declareBundle> tag. If this value is used for the <code>name</code> attribute on a + * <netui-data:declareBundle> tag. If this value is used for the <code>name</code> attribute on a * <netui-data:declareBundle> tag, * an error will be reported in the page. The <code>default</code> bundle is reserved for use when * accessing internationalized messages from the "current" Struts module's default properties file.</p> - * + * <p/> * <p>This tag provides a high level of customizability for rendering internationalized messages. - * Specifically, the Locale for which to look-up messages can be specified on the + * Specifically, the Locale for which to look-up messages can be specified on the * <netui-data:declareBundle> * tag. By default, the Locale for the current request is used, but this Locale can be overridden by - * setting the <code>language</code>, <code>country</code>, and <code>variant</code> tag attributes + * setting the <code>language</code>, <code>country</code>, and <code>variant</code> tag attributes * as necessary. See java.util.Locale for more information on the possible values for these attributes.</p> * <p>The Locale can be overridden by setting these attributes in three combinations:</p> * <blockquote> @@ -125,38 +123,37 @@ * <li>country</li> * </ul> * </blockquote> - * <p>Any other combinations will throw an exception.</p> - * + * <p>Any other combinations will throw an exception.</p> + * <p/> * <p>The <netui-data:declareBundle> tag and the Struts <i18n:getMessage> tags have * the following differences. The <netui-data:declareBundle> tag lets you * customize the use * of a particular resource bundle with attributes to set the country, - * language, and variant explicitly, but it does not write a message out to the + * language, and variant explicitly, but it does not write a message out to the * JSP page. * Writing out a message from this bundle is done inside of any of the - * other tags using the {bundle...} data binding context. - * + * other tags using the {bundle...} data binding context. + * <p/> * <pre> <netui:label value="<b>{bundle.messages.messageKey}</b>"/></pre> - * - * <p>The Struts <i18n:getMessage> tag is used to access a bundle + * <p/> + * <p>The Struts <i18n:getMessage> tag is used to access a bundle * <i>and</i> write the message out. It is roughly equivalent to doing the following: - * + * <p/> * <pre> <netui-data:declareBundle bundlePath="com/foobar/resources/messages" * name="messages"/> * <netui:label value="{bundle.messages.messageKey"/></pre> - * - * <p>An advantage of using the {bundle...} data binding context, is that it lets you - * write into the <span>...</span> that the <netui:label> + * <p/> + * <p>An advantage of using the {bundle...} data binding context, is that it lets you + * write into the <span>...</span> that the <netui:label> * creates, or into a <neuti:checkBox> name, etc. - * just like using a regular String. - * + * just like using a regular String. * @netui:tag name="declareBundle" description="Use this tag to declare a resource bundle that is available in the bundle databinding context" * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.DeclareBundleRenderer" */ public class DeclareBundle extends AbstractClassicTag - implements TryCatchFinally -{ + implements TryCatchFinally { + private String _name = null; private String _bundlePath = null; private String _language = null; @@ -169,30 +166,23 @@ * * @return a constant String representing the name of this tag. */ - public String getTagName() - { + public String getTagName() { return "DeclareBundle"; } /** * Set the language to use when looking-up resource bundle messages. This value * is used to further specify the name of the .properties file message - * keys will be read from. - * - * @param language the two-letter lowercase ISO-639 code for a language. + * keys will be read from. * - * @jsptagref.attributedescription - * The two-letter lowercase ISO-639 language code for the Locale from which to look-up resource bundle messages. + * @param language the two-letter lowercase ISO-639 code for a language. + * @jsptagref.attributedescription The two-letter lowercase ISO-639 language code for the Locale from which to look-up resource bundle messages. * This value is used to further specify the name of the .properties file from which message keys will be read. - * * @jsptagref.databindable true - * * @jsptagref.attributesyntaxvalue <i>string_language</i> - * * @netui:attribute required="false" rtexprvalue="true" */ - public void setLanguage(String language) - { + public void setLanguage(String language) { _language = language; } @@ -202,41 +192,29 @@ * keys will be read from. * * @param country the two-letter uppercase ISO-3166 code for a country - * - * @jsptagref.attributedescription - * The two-letter uppercase ISO-3166 country / region code for the - * Locale from which to look-up resource bundle messages. - * This value is used to further specify the name of the + * @jsptagref.attributedescription The two-letter uppercase ISO-3166 country / region code for the + * Locale from which to look-up resource bundle messages. + * This value is used to further specify the name of the * .properties file from which message keys will be read. - * * @jsptagref.databindable true - * * @jsptagref.attributesyntaxvalue <i>string_country</i> - * * @netui:attribute required="false" rtexprvalue="true" */ - public void setCountry(String country) - { + public void setCountry(String country) { _country = country; } /** - * Set the vendor / browser specific code that further parameterizes the + * Set the vendor / browser specific code that further parameterizes the * .properties file messages will be read from. - * - * @param variant the variant * - * @jsptagref.attributedescription - * A vendor / browser specific code for further parameterizign the Locale from which to look-up resource bundle messages. - * + * @param variant the variant + * @jsptagref.attributedescription A vendor / browser specific code for further parameterizign the Locale from which to look-up resource bundle messages. * @jsptagref.databindable true - * * @jsptagref.attributesyntaxvalue <i>string_variant</i> - * * @netui:attribute required="false" rtexprvalue="true" */ - public void setVariant(String variant) - { + public void setVariant(String variant) { _variant = variant; } @@ -246,19 +224,13 @@ * for this attribute and is reserved for use by this tag. * * @param name the name of the bundle - * - * @jsptagref.attributedescription - * The name inside of the {bundle...} databinding context under which the properties in this bundle are available. + * @jsptagref.attributedescription The name inside of the {bundle...} databinding context under which the properties in this bundle are available. * The identifier <code>default</code> is an illegal value for this attribute and is reserved for use by this tag. - * * @jsptagref.databindable false - * * @jsptagref.attributesyntaxvalue <i>string_name</i> - * * @netui:attribute required="true" */ - public void setName(String name) - { + public void setName(String name) { _name = name; } @@ -271,14 +243,12 @@ * </ul> * These are treated as equivalent values. The [EMAIL PROTECTED] java.util.ResourceBundle} class * will handle appending the <code>.properties</code> file type and locale information - * as necessary. See [EMAIL PROTECTED] java.util.ResourceBundle#getBundle(String, Locale, ClassLoader)} - * for the <code>.properties</code> file naming conventions. These files must be available in + * as necessary. See [EMAIL PROTECTED] java.util.ResourceBundle#getBundle(String, Locale, ClassLoader)} + * for the <code>.properties</code> file naming conventions. These files must be available in * classpath for the webapp in order to be successfully located. * * @param bundlePath the path to the bundle's properties files. - * - * @jsptagref.attributedescription - * Set the path to the resource bundle's properties files. This can be a slash + * @jsptagref.attributedescription Set the path to the resource bundle's properties files. This can be a slash * or dot delimited classpath. Valid values might be: * <blockquote> * <ul> @@ -288,18 +258,14 @@ * </blockquote> * <p>These are treated as equivalent values. The [EMAIL PROTECTED] java.util.ResourceBundle} class * will handle appending the <code>.properties</code> file type and locale information - * as necessary. See [EMAIL PROTECTED] java.util.ResourceBundle#getBundle(String, Locale, ClassLoader)} - * for the <code>.properties</code> file naming conventions. These files must be available in + * as necessary. See [EMAIL PROTECTED] java.util.ResourceBundle#getBundle(String, Locale, ClassLoader)} + * for the <code>.properties</code> file naming conventions. These files must be available in * classpath for the webapp in order to be successfully located. - * * @jsptagref.databindable false - * * @jsptagref.attributesyntaxvalue <i>string_bundlePath</i> - * * @netui:attribute required="true" */ - public void setBundlePath(String bundlePath) - { + public void setBundlePath(String bundlePath) { _bundlePath = bundlePath; } @@ -308,36 +274,32 @@ * * @return [EMAIL PROTECTED] javax.servlet.jsp.tagext.Tag#SKIP_BODY} */ - public int doStartTag() - { + public int doStartTag() { return SKIP_BODY; } - + /** * Register a ResourceBundle that is available for the scope of this page. Errors raised * during the execution of this tag will be reported in the page, which will continue * rendering. - * - * @throws JspException if error conditions are encountered during this method which can not - * be reported in the page. + * * @return [EMAIL PROTECTED] javax.servlet.jsp.tagext.Tag#EVAL_PAGE} + * @throws JspException if error conditions are encountered during this method which can not + * be reported in the page. */ public int doEndTag() - throws JspException - { + throws JspException { verifyAttributes(); Locale locale = getCurrentLocale(); - if(hasErrors()) - { + if(hasErrors()) { reportErrors(); return EVAL_PAGE; } Object obj = pageContext.getAttribute("bundle"); - if(obj == null) - { + if(obj == null) { BundleContext bc = new BundleContext(); bc.addBundle(_name, _bundlePath, locale); @@ -345,17 +307,13 @@ // it's available to the EL runtime. BundleMap bundleMap = new BundleMap((HttpServletRequest)pageContext.getRequest(), pageContext.getServletContext(), bc); pageContext.setAttribute("bundle", bundleMap); - } - else if(obj != null && obj instanceof BundleMap) - { + } else if(obj != null && obj instanceof BundleMap) { BundleMap bundleMap = (BundleMap)obj; BundleContext bc = bundleMap.getBundleContext(); bc.addBundle(_name, _bundlePath, locale); - } - else - { - String msg = Bundle.getErrorString("Tags_DeclareBundle_wrongContextType", new Object[] {obj.getClass().getName()}); - registerTagError(msg,null); + } else { + String msg = Bundle.getErrorString("Tags_DeclareBundle_wrongContextType", new Object[]{obj.getClass().getName()}); + registerTagError(msg, null); } if(hasErrors()) @@ -364,22 +322,19 @@ return EVAL_PAGE; } - public void doFinally() - { + public void doFinally() { localRelease(); } public void doCatch(Throwable t) - throws Throwable - { + throws Throwable { throw t; } /** * Reset all of the fields of this tag. */ - protected void localRelease() - { + protected void localRelease() { super.localRelease(); _name = null; _bundlePath = null; @@ -389,8 +344,7 @@ } private Locale getCurrentLocale() - throws JspException - { + throws JspException { if(_language == null && _country == null && _variant == null) return getUserLocale(); @@ -402,34 +356,29 @@ return new Locale(_language, _country); else if(_language != null) return new Locale(_language); - else if(_country != null || _variant != null) - { - String msg = Bundle.getErrorString("Tags_DeclareBundle_invalidLocaleOverride", new Object[] {_language, _country, _variant}); - registerTagError(msg,null); + else if(_country != null || _variant != null) { + String msg = Bundle.getErrorString("Tags_DeclareBundle_invalidLocaleOverride", new Object[]{_language, _country, _variant}); + registerTagError(msg, null); } - + return getUserLocale(); } private void verifyAttributes() - throws JspException - { - if(_name.length() == 0) - { - String msg = Bundle.getErrorString("Tags_DeclareBundle_invalidName", new Object[] {_name}); - registerTagError(msg,null); + throws JspException { + if(_name.length() == 0) { + String msg = Bundle.getErrorString("Tags_DeclareBundle_invalidName", new Object[]{_name}); + registerTagError(msg, null); } - - if(_name.equals(BundleContext.DEFAULT_STRUTS_BUNDLE_NAME)) - { + + if(_name.equals(BundleContext.DEFAULT_STRUTS_BUNDLE_NAME)) { String msg = Bundle.getErrorString("Tags_DeclareBundle_defaultIsReservedWord", null); - registerTagError(msg,null); + registerTagError(msg, null); } - if(_bundlePath.length() == 0) - { - String msg = Bundle.getErrorString("Tags_DeclareBundle_invalidResourcePath", new Object[] {_bundlePath}); - registerTagError(msg,null); - } + if(_bundlePath.length() == 0) { + String msg = Bundle.getErrorString("Tags_DeclareBundle_invalidResourcePath", new Object[]{_bundlePath}); + registerTagError(msg, null); + } } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.tags.databinding.cellrepeater; // java imports + import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -41,35 +42,35 @@ // external imports /** - * <p> - * The CellRepeater tag is a repeating, databound tag that renders - * its body each cell of a table of the specified dimensions. The tag + * <p/> + * The CellRepeater tag is a repeating, databound tag that renders + * its body each cell of a table of the specified dimensions. The tag * is bound to a dataset that is specified in the <code>dataSource</code> * attribute. For each item in the data set, the body of this tag is rendered, * and NetUI tags in the body that are databound can use the <code>container.item</code> - * syntax to access the "current" data item in the iteration. Properties - * on this data item can be accessed using expressions. + * syntax to access the "current" data item in the iteration. Properties + * on this data item can be accessed using expressions. * </p><p> * The tag will automatically insert the open and close table, row, and cell * tags which will comprise the table that is rendered. Style attributes may - * be set using attributes on this tag in order to cusotmize the tag's final + * be set using attributes on this tag in order to cusotmize the tag's final * appearance. The dimensions of the table are specified by using at least * one of the attributes columns and rows. If only one is specified, the other - * will be inferred by using the size of the given data set. As a result, the - * entire dataset will be rendered. For example, - * if a table should be four columns wide and the data set has twenty items, - * the resulting table will have five rows. If the data set is fewer items than + * will be inferred by using the size of the given data set. As a result, the + * entire dataset will be rendered. For example, + * if a table should be four columns wide and the data set has twenty items, + * the resulting table will have five rows. If the data set is fewer items than * the number of cells that should be rendered, the cells are padded with HTML table * cells: * </p> * <pre> * <td>&nbsp;</td> * </pre> - * <p> + * <p/> * This will prevent rendering a malformed HTML table. If the number of cells - * to render is smaller than the fully specified dimensions of the table, only + * to render is smaller than the fully specified dimensions of the table, only * this number of cells will be rendered. For example, if the data set is size fifty - * but the <code>rows</code> and the <code>columns</code> attributes are both seven, + * but the <code>rows</code> and the <code>columns</code> attributes are both seven, * only the first forty-nine items in the dataset will be rendered and the fiftieth * will not be shown. The values of the <code>rows</code> and the <code>columns</code> * can be databound with an expression; in this case, each value will be @@ -77,9 +78,9 @@ * fails. * </p><p> * This tag implements the [EMAIL PROTECTED] IDataAccessProvider} - * interface which provides tags access to the "current" data item. Properties - * on the <code>IDataAccessProvider</code> interface are available through the - * "container" binding context, which can be used inside of the body of the + * interface which provides tags access to the "current" data item. Properties + * on the <code>IDataAccessProvider</code> interface are available through the + * "container" binding context, which can be used inside of the body of the * CellRepeater. Properties of the <code>IDataAccessProvider</code> interface * that are available include: * <table border="1" cellspacing="0" cellpadding="5" width="75%"> @@ -89,75 +90,70 @@ * <tr><td>item</td><td>the current data item</td></tr> * </table> * </p> - * <p> + * <p/> * <b>Note:</b> the metadata property of the <code>container</code> binding context is not supported * on the CellRepeater. * </p> - * - * @jsptagref.tagdescription - * <p> - * Renders - * individual cells of an HTML table. The tag + * @jsptagref.tagdescription <p> + * Renders + * individual cells of an HTML table. The tag * is data bound to a data set specified in the <code>dataSource</code> - * attribute. Other <netui...> tags in the body of <netui-data:cellRepeater> + * attribute. Other <netui...> tags in the body of <netui-data:cellRepeater> * can use the expression <code>{container.item}</code> * to access the current data item in the data set.</p> - * - * <p> + * <p/> + * <p/> * The tag will automatically generate the open and close table, row, and cell * tags. Style attributes may - * be set using attributes on this tag in order to customize the rendered table's final + * be set using attributes on this tag in order to customize the rendered table's final * appearance. The dimensions of the table are specified with - * the attributes <code>columns</code> and <code>rows</code>. + * the attributes <code>columns</code> and <code>rows</code>. * If only one dimension is specified, the other - * will be inferred by using the size of the given data set. As a result, the - * entire dataset will be rendered. For example, - * if the <code>columns</code> attribute is set to 4 and the data set has 20 items, - * the resulting table will have 5 rows. If the data set has fewer items than + * will be inferred by using the size of the given data set. As a result, the + * entire dataset will be rendered. For example, + * if the <code>columns</code> attribute is set to 4 and the data set has 20 items, + * the resulting table will have 5 rows. If the data set has fewer items than * the number of cells that should be rendered, the cells are padded with HTML table * cells: * </p> - * + * <p/> * <pre> <td>&nbsp;</td></pre> - * - * <p> + * <p/> + * <p/> * This will prevent rendering a malformed HTML table. If the number of cells - * to render is smaller than the fully specified dimensions of the table, only + * to render is smaller than the fully specified dimensions of the table, only * this number of cells will be rendered. For example, if the data set 50 items - * but the <code>rows</code> and the <code>columns</code> attributes are both 7, + * but the <code>rows</code> and the <code>columns</code> attributes are both 7, * only the first 49 items in the dataset will be rendered and the 50th - * will not be shown. The values of the <code>rows</code> and the + * will not be shown. The values of the <code>rows</code> and the * <code>columns</code> * can take a data binding expression; in this case, each value will be - * converted into an integer. + * converted into an integer. * An error will be reported on the page if this conversion * fails. * </p> - * - * <p> - * <b>Note:</b> the <code>metadata</code> property of the <code>{container...}</code> binding context is + * <p/> + * <p/> + * <b>Note:</b> the <code>metadata</code> property of the <code>{container...}</code> binding context is * not supported in the <netui-data:cellRepeater> tag. * </p> - * - * @example - * In the following sample, the <netui-data:cellRepeater> tag creates a table with a + * @example In the following sample, the <netui-data:cellRepeater> tag creates a table with a * certain number of columns, as given in <code>{pageFlow.numColumns}</code> and as many - * rows as necessary to display all the items in the data set. + * rows as necessary to display all the items in the data set. * <pre> * <netui-data:cellRepeater dataSource="{pageFlow.itemArray}" columns="{pageFlow.numColumns}" > * Item: <netui:label value="{container.item}"/> - * </netui-data:cellRepeater> + * </netui-data:cellRepeater> * </pre> - * * @netui:tag name="cellRepeater" description="A repeating, databound tag that renders its body into each cell of a table of the specified dimensions." - * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.CellRepeaterRenderer" + * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.CellRepeaterRenderer" */ public class CellRepeater extends DataSourceTag - implements IDataAccessProvider, TryCatchFinally -{ - private static final Logger _logger = Logger.getInstance(CellRepeater.class); + implements IDataAccessProvider, TryCatchFinally { + + private static final Logger LOGGER = Logger.getInstance(CellRepeater.class); private static final int DEFAULT_DIMENSION_VALUE = -1; @@ -179,24 +175,21 @@ * * @return a constant String representing the name of this tag. */ - public String getTagName() - { + public String getTagName() { return "CellRepeater"; } /** - * Add content to the content that is being buffered by this tag. All content + * Add content to the content that is being buffered by this tag. All content * written by the body of this tag is added to this buffer. The buffer is rendered - * at the end of the tag's lifecycle if no fatal errors have occurred during this + * at the end of the tag's lifecycle if no fatal errors have occurred during this * tag's lifecycle. * * @param content content that this tag should render. */ - public void addContent(String content) - { - if(_contentBuffer == null) - { - int size = (content != null ? (5*content.length()) : 512); + public void addContent(String content) { + if(_contentBuffer == null) { + int size = (content != null ? (5 * content.length()) : 512); _contentBuffer = new StringBuilder(size); } @@ -208,102 +201,84 @@ * * @return the content String if there is content; null otherwise */ - public String getContent() - { + public String getContent() { if(_contentBuffer == null) return null; - else return _contentBuffer.toString(); + else + return _contentBuffer.toString(); } /** - * Set the HTML style class that is rendered on the HTML table that + * Set the HTML style class that is rendered on the HTML table that * is opened by this tag. For example, if the row class is "tableClass", * each opening table tag is: * <pre> * <table class="tableClass"> * </pre> - * @param tableClass the name of a style class in a CSS * - * @jsptagref.attributedescription - * The HTML style class that is rendered on the HTML table. + * @param tableClass the name of a style class in a CSS + * @jsptagref.attributedescription The HTML style class that is rendered on the HTML table. * For example, if the row class is "tableClass", * each opening table tag is: * <pre> * <table class="tableClass"></pre> - * * @jsptagref.databindable false - * * @jsptagref.attributesyntaxvalue <i>string_class</i> - * - * @netui:attribute required="false" + * @netui:attribute required="false" */ - public void setTableClass(String tableClass) - { + public void setTableClass(String tableClass) { _styleContext.setTableClass(tableClass); } /** - * Set the HTML style class that is rendered on each HTML table row that + * Set the HTML style class that is rendered on each HTML table row that * is opened by this tag. For example, if the row class is "rowClass", * each opening table row tag is: * <pre> * <tr class="rowClass"> * </pre> - * - * @param rowClass the name of a style class in the CSS * - * @jsptagref.attributedescription - * The HTML style class that is rendered on each HTML table row. + * @param rowClass the name of a style class in the CSS + * @jsptagref.attributedescription The HTML style class that is rendered on each HTML table row. * For example, if the row class is "rowClass", * each opening table row tag is: * <pre> - * <tr class="rowClass"></pre> - * + * <tr class="rowClass"></pre> * @jsptagref.databindable false - * * @jsptagref.attributesyntaxvalue <i>string_class</i> - * * @netui:attribute required="false" * @netui.tldx:attribute */ - public void setRowClass(String rowClass) - { + public void setRowClass(String rowClass) { _styleContext.setRowClass(rowClass); } /** - * Set the HTML style class that is rendered on each HTML table cell that - * is opened by this tag. For example, if the cell class is "cellClass", + * Set the HTML style class that is rendered on each HTML table cell that + * is opened by this tag. For example, if the cell class is "cellClass", * each opening table cell tag is: * <pre> * <td class="cellClass"> * </pre> - * - * @param cellClass the name of a style class in a CSS * - * @jsptagref.attributedescription - * The HTML style class that is rendered on each table cell. - * For example, if the cell class is "cellClass", + * @param cellClass the name of a style class in a CSS + * @jsptagref.attributedescription The HTML style class that is rendered on each table cell. + * For example, if the cell class is "cellClass", * each opening table cell tag is: * <pre> * <td class="cellClass"></pre> - * - * * @jsptagref.databindable false - * * @jsptagref.attributesyntaxvalue <i>string_class</i> - * * @netui:attribute required="false" */ - public void setCellClass(String cellClass) - { + public void setCellClass(String cellClass) { _styleContext.setCellClass(cellClass); } /** * Set the HTML style class that is rendered on each HTML table cell that - * is opened by this tag. The starting cell is alternated for each row, which - * results in a checkerboard colored table being displayed. For example, if the + * is opened by this tag. The starting cell is alternated for each row, which + * results in a checkerboard colored table being displayed. For example, if the * alteranting cell class is \"alternatingCellClass\", every other table cell * tag is: * <pre> @@ -311,103 +286,79 @@ * </pre> * * @param alternatingCellClass the name of a style class in a CSS - * - * @jsptagref.attributedescription - * The HTML style class that is rendered on alternating table cells. - * The starting cell is alternated for each row, which - * results in a checkerboard colored table being displayed. For example, if the + * @jsptagref.attributedescription The HTML style class that is rendered on alternating table cells. + * The starting cell is alternated for each row, which + * results in a checkerboard colored table being displayed. For example, if the * alteranting cell class is "alternatingCellClass", every other table cell * tag is: * <pre> * <td cell="alternatingCellClass"></pre> - * * @jsptagref.databindable false - * * @jsptagref.attributesyntaxvalue <i>string_class</i> - * * @netui:attribute required="false" */ - public void setAlternatingCellClass(String alternatingCellClass) - { + public void setAlternatingCellClass(String alternatingCellClass) { _styleContext.setAlternatingCellClass(alternatingCellClass); } /** * This tag can render the items in its dataset horizontally or vertically. If * the rows are rendered horizontally, the items in the dataset are rendered - * across each row from top to bottom. Otherwise, they are rendered down each + * across each row from top to bottom. Otherwise, they are rendered down each * column from left to right. The default is to render the items horizontally. - * - * @param verticalRepeat if set to <code>true</code>, the dataset is rendered down - * each column; otherwise it is rendered across each row, the default. * - * @jsptagref.attributedescription - * Boolean. If true the data set is rendered vertically, otherwise it is rendered horizontally. If + * @param verticalRepeat if set to <code>true</code>, the dataset is rendered down + * each column; otherwise it is rendered across each row, the default. + * @jsptagref.attributedescription Boolean. If true the data set is rendered vertically, otherwise it is rendered horizontally. If * the rows are rendered horizontally, the items in the data set are rendered - * across each row from top to bottom. Otherwise, they are rendered down each + * across each row from top to bottom. Otherwise, they are rendered down each * column from left to right. The default is to render the items horizontally. - * * @jsptagref.databindable false - * * @jsptagref.attributesyntaxvalue <i>boolean_verticalRepeat</i> - * * @netui:attribute required="false" */ - public void setVerticalRepeat(boolean verticalRepeat) - { + public void setVerticalRepeat(boolean verticalRepeat) { _verticalRepeat = verticalRepeat; } /** * Set the number of columns that should be rendered in the table - * generated by the tag. If the columns attribute is specified but - * the rows attribute is not, the rows attribute will be inferred + * generated by the tag. If the columns attribute is specified but + * the rows attribute is not, the rows attribute will be inferred * using the size of the dataset. * * @param columns an integer or an expression - * - * @jsptagref.attributedescription - * Integer. The number of columns that should be rendered in the HTML table. - * If the <code>columns</code> attribute is specified but - * the <code>rows</code> attribute is not, the <code>rows</code> attribute will be inferred + * @jsptagref.attributedescription Integer. The number of columns that should be rendered in the HTML table. + * If the <code>columns</code> attribute is specified but + * the <code>rows</code> attribute is not, the <code>rows</code> attribute will be inferred * using the size of the data set. - * * @jsptagref.databindable true - * * @jsptagref.attributesyntaxvalue <i>integer_columns</i> - * * @netui:attribute required="false" rtexprvalue="true" * @netui.tldx:attribute */ - public void setColumns(int columns) - { + public void setColumns(int columns) { _columns = columns; } /** * Set the number of rows that should be rendered in the table - * generated by the tag. If the rows attribute is specified but - * the columns attribute is not, the columns attribute will be + * generated by the tag. If the rows attribute is specified but + * the columns attribute is not, the columns attribute will be * inferred using the size of the dataset. * * @param rows an integer or an expression whose value can be - * converted into an integer. - * - * @jsptagref.attributedescription - * Integer. The number of rows that should be rendered in the HTML table. - * If the <code>rows</code> attribute is specified but - * the <code>columns</code> attribute is not, the <code>columns</code> attribute will be + * converted into an integer. + * @jsptagref.attributedescription Integer. The number of rows that should be rendered in the HTML table. + * If the <code>rows</code> attribute is specified but + * the <code>columns</code> attribute is not, the <code>columns</code> attribute will be * inferred using the size of the data set. - * * @jsptagref.databindable true - * * @jsptagref.attributesyntaxvalue <i>integer_rows</i> - * * @netui:attribute required="false" rtexprvalue="true" * @netui.tldx:attribute */ - public void setRows(int rows) - { + public void setRows(int rows) { _rows = rows; } @@ -417,24 +368,22 @@ * there is no data in the dataset but the rows and columns attributes were specified, * an empty table of the given dimensions is rendered. * - * @return EVAL_BODY_BUFFERED or SKIP_BODY if errors are reported, the data set - * is null, or there is no data in the data set + * @return EVAL_BODY_BUFFERED or SKIP_BODY if errors are reported, the data set + * is null, or there is no data in the data set * @throws JspException if errors occurred that could not be reported in the page */ public int doStartTag() - throws JspException - { + throws JspException { Object source = null; if(getDataSource() != null) source = evaluateDataSource(); - + if(hasErrors()) return SKIP_BODY; - if(source != null) - { + if(source != null) { Iterator iterator = null; iterator = IteratorFactory.createIterator(source); - if (iterator == null) { + if(iterator == null) { // @TODO: Logging System.err.println("CellRepeater: The data structure from which to create an iterator is null."); iterator = IteratorFactory.EMPTY_ITERATOR; @@ -442,11 +391,9 @@ if(hasErrors()) return SKIP_BODY; - if(iterator != null) - { + if(iterator != null) { _dataList = new ArrayList(); - while(iterator.hasNext()) - { + while(iterator.hasNext()) { _dataList.add(iterator.next()); } } @@ -457,18 +404,15 @@ if(hasErrors()) return SKIP_BODY; - if(_rows == DEFAULT_DIMENSION_VALUE || _columns == DEFAULT_DIMENSION_VALUE) - { + if(_rows == DEFAULT_DIMENSION_VALUE || _columns == DEFAULT_DIMENSION_VALUE) { // can try to guess the dimensions - if(_dataList != null && _dataList.size() > 0) - { + if(_dataList != null && _dataList.size() > 0) { guessDimensions(_dataList); if(hasErrors()) return SKIP_BODY; } // can't guess the dimensions - else - { + else { // warn; this isn't an error -- there just isn't any data _valid = false; return SKIP_BODY; @@ -477,9 +421,9 @@ // check to make sure the rows / columns are actually valid before starting to render validateAttributes(_rows, _columns); - + if(hasErrors()) return SKIP_BODY; - + addContent(renderTableTag()); _currentRow = 0; @@ -488,21 +432,16 @@ DataAccessProviderStack.addDataAccessProvider(this, pageContext); boolean item = ensureItem(0, _dataList); - if(item) - { + if(item) { addContent(renderRowTag()); addContent(renderCellTag(_currentColumn + (_currentRow % 2 == 0 ? 0 : 1))); return EVAL_BODY_BUFFERED; - } - else - { + } else { // special case -- with no items, render the entire table here - for(int i = 0; i < _rows; i++) - { + for(int i = 0; i < _rows; i++) { addContent(renderRowTag()); - for(int j = 0; j < _columns; j++) - { + for(int j = 0; j < _columns; j++) { addContent(renderCellTag(computeStyleIndex(i, j))); addContent(" "); addContent("</td>"); @@ -518,172 +457,154 @@ /** * Continue rendering the body of this tag until the dimensions of the table have been reached or - * the entire dataset has been rendered. The buffered body content from the previous iteration - * of the body is added to the content this tag will render, @see addContent(java.lang.String). + * the entire dataset has been rendered. The buffered body content from the previous iteration + * of the body is added to the content this tag will render, @see addContent(java.lang.String). * Pad the table if the dimensions have not been met but the dataset is empty. - * - * @return EVAL_BODY_BUFFERED if there is more data to render in the dataset or - * SKIP_BODY if the end of the dataset is reached or an error occurs - */ - public int doAfterBody() - { - if(bodyContent != null) - { + * + * @return EVAL_BODY_BUFFERED if there is more data to render in the dataset or + * SKIP_BODY if the end of the dataset is reached or an error occurs + */ + public int doAfterBody() { + if(bodyContent != null) { addContent(bodyContent.getString()); bodyContent.clearBody(); } boolean haveNext = false; - while(!haveNext) - { + while(!haveNext) { _currentColumn++; // close the last cell addContent("</td>"); // new row; close last row - if(_currentColumn == _columns) - { + if(_currentColumn == _columns) { _currentRow++; _currentColumn = 0; addContent("</tr>\n"); } // end - if(_currentRow == _rows && _currentColumn == 0) - { + if(_currentRow == _rows && _currentColumn == 0) { return SKIP_BODY; } if(_currentColumn == 0) addContent((renderRowTag())); - + if(_verticalRepeat) - haveNext = ensureItem(_currentColumn*_rows + _currentRow, _dataList); - else haveNext = ensureItem(_currentRow*_columns + _currentColumn, _dataList); + haveNext = ensureItem(_currentColumn * _rows + _currentRow, _dataList); + else + haveNext = ensureItem(_currentRow * _columns + _currentColumn, _dataList); - if(!haveNext) - { - if(_logger.isDebugEnabled()) _logger.debug("missing next at location (" + _currentRow + ", " + _currentColumn + ")"); + if(!haveNext) { + if(LOGGER.isDebugEnabled()) LOGGER.debug("missing next at location (" + _currentRow + ", " + _currentColumn + ")"); // render empty cell addContent(renderCellTag(computeStyleIndex(_currentRow, _currentColumn))); addContent(" "); - } - else - { + } else { addContent(renderCellTag(computeStyleIndex(_currentRow, _currentColumn))); return EVAL_BODY_AGAIN; } } - + return SKIP_BODY; } /** - * Complete rendering the tag. If no errors have occurred, the content that + * Complete rendering the tag. If no errors have occurred, the content that * the tag buffered is rendered. * - * @throws JspException if an error occurs that can not be reported on the page * @return EVAL_PAGE to continue evaluating the page + * @throws JspException if an error occurs that can not be reported on the page */ public int doEndTag() - throws JspException - { - if(hasErrors()) - { + throws JspException { + if(hasErrors()) { reportErrors(); - } - else if(_valid) - { + } else if(_valid) { addContent("</table>"); - + write(getContent()); } DataAccessProviderStack.removeDataAccessProvider(pageContext); - + pageContext.removeAttribute("container"); - + return EVAL_PAGE; } - public void doFinally() - { + public void doFinally() { localRelease(); } public void doCatch(Throwable t) - throws Throwable - { + throws Throwable { throw t; } /** - * Get the index of the current iteration through the body of this tag. This - * data can be accessed using the expression <code>container.index</code> - * on an attribute of a databindable NetUI tag that is contained within the - * repeating body of this tag. This expression is only valid when the dataset + * Get the index of the current iteration through the body of this tag. This + * data can be accessed using the expression <code>container.index</code> + * on an attribute of a databindable NetUI tag that is contained within the + * repeating body of this tag. This expression is only valid when the dataset * is being rendered. - * - * @see org.apache.beehive.netui.script.common.IDataAccessProvider + * * @return the integer index of the current data item in the data set + * @see org.apache.beehive.netui.script.common.IDataAccessProvider */ - public int getCurrentIndex() - { + public int getCurrentIndex() { return _currentIndex; } /** - * Get the item that is currently being rendered by this repeating tag. + * Get the item that is currently being rendered by this repeating tag. * This can be accessed using the expression <code>expression.item</code> - * on an attribute of a databindable netUI tag that is contained within - * the repeating body of this tag. The expression is only valid when the dataset + * on an attribute of a databindable netUI tag that is contained within + * the repeating body of this tag. The expression is only valid when the dataset * is being rendered. - * - * @see org.apache.beehive.netui.script.common.IDataAccessProvider + * * @return the current item in the data set + * @see org.apache.beehive.netui.script.common.IDataAccessProvider */ - public Object getCurrentItem() - { + public Object getCurrentItem() { return _currentItem; } /** - * Get the metadata for the current item. This method is not supported by + * Get the metadata for the current item. This method is not supported by * this tag. - * - * @see org.apache.beehive.netui.script.common.IDataAccessProvider + * * @throws UnsupportedOperationException this tag does not support this method from the IDataAccessProvider interface + * @see org.apache.beehive.netui.script.common.IDataAccessProvider */ - public Object getCurrentMetadata() - { - LocalizedUnsupportedOperationException uoe = + public Object getCurrentMetadata() { + LocalizedUnsupportedOperationException uoe = new LocalizedUnsupportedOperationException("The " + getTagName() + "does not export metadata for its iterated items."); - uoe.setLocalizedMessage(Bundle.getErrorString("Tags_DataAccessProvider_metadataUnsupported", new Object[] {getTagName()})); + uoe.setLocalizedMessage(Bundle.getErrorString("Tags_DataAccessProvider_metadataUnsupported", new Object[]{getTagName()})); throw uoe; } /** * Get the parent IDataAccessProvider for this tag. If this tag is contained within - * a IDataAccessProvider, the containing IDataAccessProvider is available through the + * a IDataAccessProvider, the containing IDataAccessProvider is available through the * expression <code>container.container</code>. Any valid properties of the - * parent IDataAccessProvider can be accessed through this expression. This method + * parent IDataAccessProvider can be accessed through this expression. This method * will return null if there is no parent IDataAccessProvider - * - * @see org.apache.beehive.netui.script.common.IDataAccessProvider + * * @return a containing IDataAccessProvider if one exists, null otherwise. + * @see org.apache.beehive.netui.script.common.IDataAccessProvider */ - public IDataAccessProvider getProviderParent() - { - return (IDataAccessProvider)findAncestorWithClass(this, IDataAccessProvider.class); + public IDataAccessProvider getProviderParent() { + return (IDataAccessProvider)findAncestorWithClass(this, IDataAccessProvider.class); } /** * Reset all of the fields of this tag. */ - protected void localRelease() - { + protected void localRelease() { super.localRelease(); if(bodyContent != null) bodyContent.clearBody(); @@ -701,56 +622,45 @@ } private void reportBasicError(String message) - throws JspException - { - registerTagError(message,null); + throws JspException { + registerTagError(message, null); } private void guessDimensions(List data) - throws JspException - { + throws JspException { if(_rows == 0 || _columns == 0) reportBasicError(Bundle.getString("Tags_CellRepeater_missingRowsOrColumns")); if(data == null) return; int dataSize = data.size(); - if(_rows == DEFAULT_DIMENSION_VALUE && _columns == DEFAULT_DIMENSION_VALUE) - { + if(_rows == DEFAULT_DIMENSION_VALUE && _columns == DEFAULT_DIMENSION_VALUE) { reportBasicError(Bundle.getString("Tags_CellRepeater_invalidRowOrColumn")); - } - else if(_rows == DEFAULT_DIMENSION_VALUE) - { + } else if(_rows == DEFAULT_DIMENSION_VALUE) { int remainder = dataSize % _columns; _rows = (dataSize / _columns) + (remainder > 0 ? 1 : 0); - if(_logger.isDebugEnabled()) _logger.debug("guessed row size: " + _rows); - } - else if(_columns == DEFAULT_DIMENSION_VALUE) - { + if(LOGGER.isDebugEnabled()) LOGGER.debug("guessed row size: " + _rows); + } else if(_columns == DEFAULT_DIMENSION_VALUE) { int remainder = dataSize % _rows; _columns = (dataSize / _rows) + (remainder > 0 ? 1 : 0); - if(_logger.isDebugEnabled()) _logger.debug("guessed column size: " + _columns); + if(LOGGER.isDebugEnabled()) LOGGER.debug("guessed column size: " + _columns); } } private void validateAttributes(int rows, int columns) - throws JspException - { - if(rows <= 0) - { - String msg = Bundle.getString("Tags_CellRepeater_invalidRowValue", new Object[] {getTagName(), new Integer(rows)}); - registerTagError(msg,null); + throws JspException { + if(rows <= 0) { + String msg = Bundle.getString("Tags_CellRepeater_invalidRowValue", new Object[]{getTagName(), new Integer(rows)}); + registerTagError(msg, null); } - if(columns <= 0) - { - String msg = Bundle.getString("Tags_CellRepeater_invalidColumnValue", new Object[] {getTagName(), new Integer(columns)}); - registerTagError(msg,null); + if(columns <= 0) { + String msg = Bundle.getString("Tags_CellRepeater_invalidColumnValue", new Object[]{getTagName(), new Integer(columns)}); + registerTagError(msg, null); } } - private final String renderTableTag() - { + private final String renderTableTag() { if(_styleContext == null) return "<table>"; @@ -761,11 +671,10 @@ return buf.toString(); } - private final String renderRowTag() - { + private final String renderRowTag() { if(_styleContext == null) return "<tr>"; - + StringBuilder buf = new StringBuilder("<tr"); buf.append(_styleContext.renderRowStyle()); buf.append(">"); @@ -773,36 +682,34 @@ return buf.toString(); } - private final String renderCellTag(int index) - { + private final String renderCellTag(int index) { if(_styleContext == null) return "<td>"; StringBuilder buf = new StringBuilder("<td"); if(index % 2 == 0) buf.append(_styleContext.renderCellStyle()); - else buf.append(_styleContext.renderAlternatingCellStyle()); + else + buf.append(_styleContext.renderAlternatingCellStyle()); buf.append(">"); return buf.toString(); } - private final int computeStyleIndex(int r, int c) - { + private final int computeStyleIndex(int r, int c) { return c + (r % 2); } - private boolean ensureItem(int index, List data) - { - if(_logger.isDebugEnabled()) _logger.debug("item: " + 0 + " data: " + (data == null ? "null data" : - (index < data.size() ? "" + index : "index out of bounds for size " + data.size()))); + private boolean ensureItem(int index, List data) { + if(LOGGER.isDebugEnabled()) + LOGGER.debug("item: " + 0 + " data: " + (data == null ? "null data" : + (index < data.size() ? "" + index : "index out of bounds for size " + data.size()))); - if(data != null && index < data.size()) - { + if(data != null && index < data.size()) { _currentItem = data.get(index); _currentIndex = index; return true; - } - else return false; + } else + return false; } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/style/CellRepeaterStyleBean.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/style/CellRepeaterStyleBean.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/style/CellRepeaterStyleBean.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/style/CellRepeaterStyleBean.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/style/CellRepeaterStyleBean.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/style/CellRepeaterStyleBean.java Wed Jan 19 11:00:31 2005 @@ -20,6 +20,7 @@ // java imports // internal imports + import org.apache.beehive.netui.tags.databinding.base.style.AbstractStyleBean; // external imports @@ -28,40 +29,35 @@ * */ public class CellRepeaterStyleBean - extends AbstractStyleBean -{ + extends AbstractStyleBean { + private String _cellClass = null; private String _alternatingCellClass = null; - public void setCellClass(String cellClass) - { + public void setCellClass(String cellClass) { _cellClass = cellClass; } - public String getCellClass() - { + public String getCellClass() { return _cellClass; } - public void setAlternatingCellClass(String alternatingCellClass) - { + public void setAlternatingCellClass(String alternatingCellClass) { _alternatingCellClass = alternatingCellClass; } - public String getAlternatingCellClass() - { + public String getAlternatingCellClass() { return _alternatingCellClass; } - public String renderCellStyle() - { + public String renderCellStyle() { return renderStyle(_cellClass); } - public String renderAlternatingCellStyle() - { + public String renderAlternatingCellStyle() { if(_alternatingCellClass != null) return renderStyle(_alternatingCellClass); - else return renderStyle(_cellClass); + else + return renderStyle(_cellClass); } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java Wed Jan 19 11:00:31 2005 @@ -66,7 +66,6 @@ } /** - * * @throws JspException * @throws IOException */ @@ -79,7 +78,7 @@ int gridRenderState = dataGridModel.getRenderState(); /* START_RENDER_STATE is a no-op for columns */ - if (gridRenderState == DataGridModel.START_RENDER_STATE) { + if(gridRenderState == DataGridModel.START_RENDER_STATE) { return; } // otherwise, the ColumnModel associated with this tag @@ -91,7 +90,7 @@ int renderState = columns.getRenderState(); assert renderState == ColumnsModel.DATA_RENDER_STATE || - renderState == ColumnsModel.HEADER_RENDER_STATE; + renderState == ColumnsModel.HEADER_RENDER_STATE; CellModel model = internalGetCellModel(); model.setDataGridModel(dataGridModel); @@ -99,7 +98,7 @@ applyAttributes(); - if (LOGGER.isDebugEnabled()) { + if(LOGGER.isDebugEnabled()) { LOGGER.debug("current column\n\trender state: " + renderState); LOGGER.debug("\tidentity hash code: " + System.identityHashCode(model)); } @@ -109,13 +108,13 @@ StringBuilder content = new StringBuilder(); AbstractRenderAppender appender = new StringBuilderRenderAppender(content); - if (renderState == ColumnsModel.HEADER_RENDER_STATE) { + if(renderState == ColumnsModel.HEADER_RENDER_STATE) { renderHeaderCell(appender); - } else if (renderState == ColumnsModel.DATA_RENDER_STATE) { + } else if(renderState == ColumnsModel.DATA_RENDER_STATE) { renderDataCell(appender); } - if (content != null && content.length() > 0) + if(content != null && content.length() > 0) getJspContext().getOut().println(content.toString()); DataGridUtil.removeColumnModel(getJspContext()); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java Wed Jan 19 11:00:31 2005 @@ -41,8 +41,8 @@ */ public abstract class AbstractHtmlColumn extends AbstractColumn - implements IAttributeConsumer -{ + implements IAttributeConsumer { + private static final String HEADER_FACET_NAME = "header"; private static final String DEFAULT_FACET_NAME = "default"; private static final CellDecorator DEFAULT_HEADER_RENDERER; @@ -444,7 +444,7 @@ * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.JspStyleProperty" category="format" */ public void setHeaderStyle(String style) { - if ("".equals(style)) return; + if("".equals(style)) return; internalGetThState().style = style; } @@ -460,7 +460,7 @@ * @netui.tldx:attribute category="Format" */ public void setHeaderStyleClass(String styleClass) { - if ("".equals(styleClass)) return; + if("".equals(styleClass)) return; internalGetThState().styleClass = styleClass; } @@ -485,13 +485,13 @@ * the <code>id</code> or <code>name</code> attributes. In addition, the base tag does * not allow facets to be set. If the attribute is legal it will be added to the * general expression map stored in the <code>AbstractHtmlState</code> of the tag. + * * @param name The name of the attribute. This value may not be null or the empty string. * @param value The value of the attribute. This may contain an expression. * @param facet The name of a facet to which the attribute will be applied. This is optional. */ public void setAttribute(String name, String value, String facet) - throws JspException - { + throws JspException { /* TODO: need to handle pluggable facets here */ if(facet != null && facet.equals(HEADER_FACET_NAME)) addStateAttribute(internalGetThState(), name, value, facet); @@ -504,7 +504,6 @@ } /** - * * @return */ protected abstract AbstractHtmlState internalGetHtmlState(); @@ -518,7 +517,7 @@ TableRenderer tableRenderer = dataGridModel.getTableRenderer(); assert tableRenderer != null; - if (internalGetThState().styleClass == null) + if(internalGetThState().styleClass == null) internalGetThState().styleClass = dataGridModel.getCssPolicy().getHeaderCellClass(); tableRenderer.openHeaderCell(internalGetThState(), appender); @@ -542,7 +541,7 @@ /* hopefully, the container optimizes this so that if the JspFragment is empty, the invocation is cheap */ JspFragment fragment = getJspBody(); StringWriter sw = new StringWriter(); - if (fragment != null) { + if(fragment != null) { fragment.invoke(sw); /* ignore the return value */ sw.toString(); @@ -551,7 +550,7 @@ tableRenderer.openTableCell(_tdState, appender); renderDataCellContents(appender); tableRenderer.closeTableCell(appender); - } + } /* todo: support rendering sort / filter links */ protected void renderHeaderCellContents(AbstractRenderAppender appender) @@ -560,7 +559,7 @@ JspFragment fragment = getJspBody(); StringWriter sw = new StringWriter(); String bodyContent = null; - if (fragment != null) { + if(fragment != null) { fragment.invoke(sw); bodyContent = sw.toString(); } @@ -586,45 +585,39 @@ } private void addStateAttribute(AbstractHtmlState state, String name, String value, String facet) - throws JspException - { + throws JspException { boolean error = false; // validate the name attribute, in the case of an error simply return. - if (name == null || name.length() <= 0) { + if(name == null || name.length() <= 0) { String s = Bundle.getString("Tags_AttributeNameNotSet"); throw new JspException(s); } // it's not legal to set the id or name attributes this way - if (name != null && (name.equals(HtmlConstants.ID) || name.equals(HtmlConstants.NAME))) { + if(name != null && (name.equals(HtmlConstants.ID) || name.equals(HtmlConstants.NAME))) { String s = Bundle.getString("Tags_AttributeMayNotBeSet", new Object[]{name}); throw new JspException(s); } - if (error) + if(error) return; // if there is a style or class we will let them override the base - if (name.equals(HtmlConstants.CLASS)) - { + if(name.equals(HtmlConstants.CLASS)) { state.styleClass = value; return; - } - else if (name.equals(HtmlConstants.STYLE)) - { + } else if(name.equals(HtmlConstants.STYLE)) { state.style = value; return; } state.registerAttribute(AbstractHtmlState.ATTR_GENERAL, name, value); } - private final ThTag.State internalGetThState() - { + private final ThTag.State internalGetThState() { return _thState; } - private final TdTag.State internalGetTdState() - { + private final TdTag.State internalGetTdState() { return _tdState; } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java Wed Jan 19 11:00:31 2005 @@ -29,10 +29,10 @@ /** * @netui:tag name="anchorColumn" - * description="Renders a column of anchors in a NetUI data grid" - * body-content="scriptless" + * description="Renders a column of anchors in a NetUI data grid" + * body-content="scriptless" * @netui.tldx:tag whitespace="indent" - * renderer="workshop.netui.jspdesigner.tldx.AnchorColumnRenderer" + * renderer="workshop.netui.jspdesigner.tldx.AnchorColumnRenderer" */ public class AnchorColumn extends AbstractHtmlColumn @@ -85,15 +85,14 @@ } protected void applyAttributes() - throws JspException { + throws JspException { super.applyAttributes(); - if (_anchorCellModel.getAction() != null && _anchorCellModel.getHref() != null) + if(_anchorCellModel.getAction() != null && _anchorCellModel.getHref() != null) throw new JspException("Unable to create AnchorCellModel. The 'action' and 'href' attributes can not both be set."); } - protected AbstractHtmlState internalGetHtmlState() - { + protected AbstractHtmlState internalGetHtmlState() { return _anchorCellModel.getAnchorState(); } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java Wed Jan 19 11:00:31 2005 @@ -26,34 +26,29 @@ import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel; /** - * * @netui:tag name="caption" - * body-content="scriptless" - * description="Renders a caption into a NetUI data grid" + * body-content="scriptless" + * description="Renders a caption into a NetUI data grid" * @netui.tldx:tag whitespace="indent" - * renderer="" + * renderer="" */ public class Caption - extends AbstractSimpleTag -{ - public String getTagName() - { + extends AbstractSimpleTag { + + public String getTagName() { return "Caption"; } public void doTag() - throws IOException, JspException - { + throws IOException, JspException { DataGridModel dgm = DataGridUtil.getDataGridModel(getJspContext()); assert dgm != null; - if(dgm.getRenderState() == DataGridModel.CAPTION_RENDER_STATE) - { + if(dgm.getRenderState() == DataGridModel.CAPTION_RENDER_STATE) { JspFragment fragment = getJspBody(); StringWriter sw = new StringWriter(); String bodyContent = null; - if(fragment != null) - { + if(fragment != null) { fragment.invoke(sw); bodyContent = sw.toString(); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Columns.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Columns.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Columns.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Columns.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Columns.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Columns.java Wed Jan 19 11:00:31 2005 @@ -33,38 +33,33 @@ import org.apache.beehive.netui.tags.rendering.TrTag; /** - * * @netui:tag name="columns" - * description="Container tag for columsn that will render in the grid" - * body-content="scriptless" - * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.ColumnsRenderer" - * whitespace="indent" - * requiredparent="dataGrid" + * description="Container tag for columsn that will render in the grid" + * body-content="scriptless" + * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.ColumnsRenderer" + * whitespace="indent" + * requiredparent="dataGrid" */ public class Columns - extends AbstractSimpleTag -{ + extends AbstractSimpleTag { + public String getTagName() { return "Columns"; } - + public void doTag() - throws IOException, JspException - { + throws IOException, JspException { JspContext jspContext = getJspContext(); DataGridModel dataGridModel = DataGridUtil.getDataGridModel(jspContext); assert dataGridModel != null; - + int gridRenderState = dataGridModel.getRenderState(); if(gridRenderState == DataGridModel.CAPTION_RENDER_STATE || - gridRenderState == DataGridModel.FOOTER_RENDER_STATE || - gridRenderState == DataGridModel.START_RENDER_STATE) - { + gridRenderState == DataGridModel.FOOTER_RENDER_STATE || + gridRenderState == DataGridModel.START_RENDER_STATE) { return; - } - else if(gridRenderState == DataGridModel.GRID_RENDER_STATE) - { + } else if(gridRenderState == DataGridModel.GRID_RENDER_STATE) { TableRenderer tableRenderer = dataGridModel.getTableRenderer(); assert tableRenderer != null; @@ -87,8 +82,7 @@ // render data rows columnsModel.setRenderState(ColumnsModel.DATA_RENDER_STATE); - while(dataGridModel.hasNextDataItem()) - { + while(dataGridModel.hasNextDataItem()) { sw = new StringWriter(); TrTag.State trState = new TrTag.State(); setupDataRowStyle(trState, dataGridModel); @@ -116,6 +110,7 @@ int index = dataGridModel.getCurrentIndex(); if(index % 2 == 0) state.styleClass = stylePolicy.getRowClass(); - else state.styleClass = stylePolicy.getAltRowClass(); + else + state.styleClass = stylePolicy.getAltRowClass(); } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java Wed Jan 19 11:00:31 2005 @@ -32,7 +32,7 @@ * @netui.tldx:tag renderer="" whitespace="indent" */ public class ConfigurePager - extends AbstractSimpleTag { + extends AbstractSimpleTag { private static final String FIRST_LAST_PREV_NEXT = "firstPrevNextLast"; private static final String PREV_NEXT = "prevNext"; @@ -96,8 +96,8 @@ } public void doTag() - throws JspException { - + throws JspException { + DataGridModel dgm = DataGridUtil.getDataGridModel(getJspContext()); assert dgm != null; @@ -111,26 +111,27 @@ pm.setPageSize(_pageSize); /* todo: support pluggable pager renderers */ - if (_pagerFormat != null) { - if (_pagerFormat.equals(FIRST_LAST_PREV_NEXT)) + if(_pagerFormat != null) { + if(_pagerFormat.equals(FIRST_LAST_PREV_NEXT)) pagerRenderer = new FirstPreviousNextLastPagerRenderer(dgm); - else if (_pagerFormat.equals(PREV_NEXT)) + else if(_pagerFormat.equals(PREV_NEXT)) pagerRenderer = new PreviousNextPagerRenderer(dgm); - else throw new JspException("The pagerFormat \"" + _pagerFormat + "\" is not supported"); + else + throw new JspException("The pagerFormat \"" + _pagerFormat + "\" is not supported"); dgm.setPagerRenderer(pagerRenderer); } - if (_pageHref != null && _pageAction != null) + if(_pageHref != null && _pageAction != null) throw new JspException("The configurePager tag can't set both the pageAction and pageHref attributes"); - if (_pageHref == null && _pageAction == null) + if(_pageHref == null && _pageAction == null) throw new JspException("The configurePager tag requires one of the pageAction or pageHref attributes in order to render a pager link."); - if (_pageHref != null) + if(_pageHref != null) pm.setPageHref(_pageHref); - if (_pageAction != null) + if(_pageAction != null) pm.setPageAction(_pageAction); return; Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java Wed Jan 19 11:00:31 2005 @@ -44,10 +44,10 @@ /** * @netui:tag name="dataGrid" - * description="Renders an HTML table containing a data set" - * body-content="scriptless" + * description="Renders an HTML table containing a data set" + * body-content="scriptless" * @netui.tldx:tag whitespace="indent" - * renderer="workshop.netui.jspdesigner.tldx.GridRenderer" + * renderer="workshop.netui.jspdesigner.tldx.GridRenderer" */ public class DataGrid extends AbstractSimpleTag @@ -121,16 +121,16 @@ PagedDataSet dataSet = new PagedDataSet(dataSource, iterator); StylePolicy stylePolicy = null; - if (_styleClassPrefix != null) + if(_styleClassPrefix != null) stylePolicy = new DefaultStylePolicy(_styleClassPrefix); - else if (_stylePolicy == DEFAULT_STYLE_POLICY_VALUE || _stylePolicy.equals(DEFAULT_STYLE_POLICY_VALUE)) + else if(_stylePolicy == DEFAULT_STYLE_POLICY_VALUE || _stylePolicy.equals(DEFAULT_STYLE_POLICY_VALUE)) stylePolicy = DEFAULT_STYLE_POLICY; - else if (_stylePolicy.equals(NO_STYLE_POLICY_VALUE)) + else if(_stylePolicy.equals(NO_STYLE_POLICY_VALUE)) stylePolicy = EMPTY_STYLE_POLICY; HttpServletRequest request = (HttpServletRequest)((PageContext)getJspContext()).getRequest(); TableRenderer tableRenderer = new TableRenderer(request, stylePolicy); - + _gridModel = new DataGridModel(getJspContext(), _name, dataSet); _gridModel.setCssPolicy(stylePolicy); _gridModel.setTableRenderer(tableRenderer); @@ -144,8 +144,7 @@ } JspFragment fragment = getJspBody(); - if (fragment != null) - { + if(fragment != null) { StringBuilder builder = new StringBuilder(2048); AbstractRenderAppender appender = new StringBuilderRenderAppender(builder); @@ -182,7 +181,7 @@ sw = new StringWriter(); fragment.invoke(sw); String caption = sw.toString(); - if (caption != null && !caption.trim().equals("")) { + if(caption != null && !caption.trim().equals("")) { tableRenderer.openCaption(appender); appender.append(caption); tableRenderer.closeCaption(appender); @@ -200,7 +199,7 @@ fragment.invoke(sw); String footer = sw.toString(); String trimmed = footer.trim(); - if (footer != null && !trimmed.trim().equals("")) { + if(footer != null && !trimmed.trim().equals("")) { tableRenderer.openFooterRow(null, appender); appender.append(footer); tableRenderer.closeFooterRow(appender); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGridUtil.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGridUtil.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGridUtil.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGridUtil.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGridUtil.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGridUtil.java Wed Jan 19 11:00:31 2005 @@ -54,7 +54,7 @@ public static final ColumnsModel getColumnsModel(JspContext jspContext) { Object model = jspContext.getAttribute(COLUMNS_MODEL_KEY); assert model != null ? model instanceof ColumnsModel : true; - return (ColumnsModel) model; + return (ColumnsModel)model; } public static final void putColumnsModel(JspContext jspContext, ColumnsModel columnsModel) { Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java Wed Jan 19 11:00:31 2005 @@ -27,32 +27,28 @@ /** * @netui:tag name="footer" - * description="Renders a footer into a NetUI data grid" - * body-content="scriptless" + * description="Renders a footer into a NetUI data grid" + * body-content="scriptless" * @netui.tldx:tag whitespace="indent" - * renderer=""* + * renderer=""* */ public class Footer - extends AbstractSimpleTag -{ - public String getTagName() - { + extends AbstractSimpleTag { + + public String getTagName() { return "Footer"; } public void doTag() - throws IOException, JspException - { + throws IOException, JspException { DataGridModel dgm = DataGridUtil.getDataGridModel(getJspContext()); assert dgm != null; - if(dgm.getRenderState() == DataGridModel.FOOTER_RENDER_STATE) - { + if(dgm.getRenderState() == DataGridModel.FOOTER_RENDER_STATE) { JspFragment fragment = getJspBody(); StringWriter sw = new StringWriter(); String bodyContent = null; - if(fragment != null) - { + if(fragment != null) { fragment.invoke(sw); bodyContent = sw.toString(); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java Wed Jan 19 11:00:31 2005 @@ -25,14 +25,13 @@ import org.apache.beehive.netui.tags.html.HtmlConstants; /** - * * @netui:tag name="imageColumn" description="Renders a column of images in a NetUI data grid" body-content="scriptless" * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.ImageColumnRenderer" - * whitespace="indent" + * whitespace="indent" */ public class ImageColumn - extends AbstractHtmlColumn -{ + extends AbstractHtmlColumn { + private static final ImageCellDecorator DECORATOR = new ImageCellDecorator(); private ImageCellModel _imageCellModel = new ImageCellModel(); @@ -99,13 +98,11 @@ _imageCellModel.getImageState().registerAttribute(AbstractHtmlState.ATTR_GENERAL, HtmlConstants.WIDTH, width); } - public String getTagName() - { + public String getTagName() { return "ImageColumn"; } - public void renderDataCellContents(AbstractRenderAppender appender) - { + public void renderDataCellContents(AbstractRenderAppender appender) { DECORATOR.decorate(getJspContext(), appender, _imageCellModel); } @@ -113,8 +110,7 @@ return _imageCellModel.getImageState(); } - protected AbstractHtmlState internalGetHtmlState() - { + protected AbstractHtmlState internalGetHtmlState() { return internalGetImageState(); } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java Wed Jan 19 11:00:31 2005 @@ -24,16 +24,15 @@ import org.apache.beehive.netui.databinding.datagrid.rendering.cell.LiteralCellDecorator; /** - * * @netui:tag name="literalColumn" - * description="Renders a column of data in a NetUI grid" - * body-content="scriptless" + * description="Renders a column of data in a NetUI grid" + * body-content="scriptless" * @netui.tldx:tag whitespace="indent" - * renderer="workshop.netui.jspdesigner.tldx.LiteralColumnRenderer" + * renderer="workshop.netui.jspdesigner.tldx.LiteralColumnRenderer" */ public class LiteralColumn - extends AbstractHtmlColumn -{ + extends AbstractHtmlColumn { + private static final LiteralCellDecorator DECORATOR = new LiteralCellDecorator(); private LiteralCellModel _literalCellModel = new LiteralCellModel(); @@ -53,8 +52,7 @@ DECORATOR.decorate(getJspContext(), appender, _literalCellModel); } - protected AbstractHtmlState internalGetHtmlState() - { + protected AbstractHtmlState internalGetHtmlState() { return _literalCellModel.getSpanState(); } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/RenderPager.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/RenderPager.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/RenderPager.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/RenderPager.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/RenderPager.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/RenderPager.java Wed Jan 19 11:00:31 2005 @@ -25,20 +25,18 @@ /** * @netui:tag name="renderPager" body-content="empty" - * description="Tag for rendering a pager in a specific spot inside of a data grid tag" + * description="Tag for rendering a pager in a specific spot inside of a data grid tag" * @netui.tldx:tag renderer="" whitespace="indent" */ public class RenderPager - extends AbstractSimpleTag -{ - public String getTagName() - { + extends AbstractSimpleTag { + + public String getTagName() { return "RenderPager"; } public void doTag() - throws JspException - { + throws JspException { JspContext jspContext = getJspContext(); DataGridModel dgm = (DataGridModel)jspContext.getAttribute("dataGrid"); assert dgm != null : "RenderPager did not find a DataGridModel"; Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/AbstractCallMethod.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/AbstractCallMethod.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/AbstractCallMethod.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/AbstractCallMethod.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/AbstractCallMethod.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/AbstractCallMethod.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.tags.databinding.invoke; // java imports + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -36,34 +37,33 @@ // external imports /** - * <p> + * <p/> * An abstract base class for tags that are capable of reflectively * invoking methods. Specializations of this tag provide method - * implementations that locate the object on which to invoke the - * method and that handle any return value from the invoked + * implementations that locate the object on which to invoke the + * method and that handle any return value from the invoked * method. * <p/> - * <p> - * The <code>CallMethod</code> tag can have child tags of type + * <p/> + * The <code>CallMethod</code> tag can have child tags of type * [EMAIL PROTECTED] MethodParameter}; these tags must be in the same - * order as the parameter list in the method signature of the - * method that will be invoked. To invoke an overloaded method, the + * order as the parameter list in the method signature of the + * method that will be invoked. To invoke an overloaded method, the * [EMAIL PROTECTED] MethodParameter#setType(String)} property must be set to the String * name of the type to pass to the method. If the type attribute values - * on nested [EMAIL PROTECTED] MethodParameter} tags do not match any method signature, + * on nested [EMAIL PROTECTED] MethodParameter} tags do not match any method signature, * an error will be reported in the page. * </p> - */ public abstract class AbstractCallMethod - extends AbstractClassicTag -{ - private static final Logger _logger = Logger.getInstance(AbstractCallMethod.class); + extends AbstractClassicTag { + + private static final Logger LOGGER = Logger.getInstance(AbstractCallMethod.class); private static final Object[] EMPTY_ARGS = new Object[0]; private static final String EMPTY_STRING = ""; private static final List EMPTY_LIST = new ArrayList(); - + private List _parameters = null; private String _method = null; private boolean _failOnError = true; @@ -71,16 +71,14 @@ private boolean _verifyTypes = false; /** - * Sets the identifier at which the result of invoking the method will - * stored. + * Sets the identifier at which the result of invoking the method will + * stored. * * @param resultId a String that names an attribute in the PageContext's - * attribute map where any resulting object will be stored. - * + * attribute map where any resulting object will be stored. * @netui:attribute required="false" */ - public void setResultId(String resultId) - { + public void setResultId(String resultId) { _resultId = resultId; } @@ -89,12 +87,10 @@ * occur invoking a method on an object. * * @param failOnError a boolean that defines whether or not exceptions - * should be thrown when invocation fails. - * + * should be thrown when invocation fails. * @netui:attribute required="false" */ - public void setFailOnError(boolean failOnError) - { + public void setFailOnError(boolean failOnError) { _failOnError = failOnError; } @@ -102,27 +98,24 @@ * Sets the name of a method to invoke on the target object. * * @param method the name of the method to invoke - * * @netui:attribute required="true" */ - public void setMethod(String method) - { + public void setMethod(String method) { _method = method; } /** - * Add a paramter that will be passed as an argument to the method that - * will be invoked. This method is implemented to allow the + * Add a paramter that will be passed as an argument to the method that + * will be invoked. This method is implemented to allow the * the [EMAIL PROTECTED] MethodParameter} tags to register - * their parameters. This object is passed in the position that it + * their parameters. This object is passed in the position that it * appeared in the set of child [EMAIL PROTECTED] MethodParameter} tags. * - * @param type a String of the type or class name of this parameter + * @param type a String of the type or class name of this parameter * @param parameter an object that should be passed as an argument to the invoked method * @see MethodParameter */ - public void addParameter(String type, Object parameter) - { + public void addParameter(String type, Object parameter) { if(_parameters == null) _parameters = new ArrayList(); @@ -138,34 +131,33 @@ /** * Causes the body of this tag to be rendered; only [EMAIL PROTECTED] MethodParameter} - * tags are allowed to be contained inside of this tag. The body content is + * tags are allowed to be contained inside of this tag. The body content is * never rendered. * * @return EVAL_BODY_BUFFERED * @see MethodParameter */ public int doStartTag() - throws JspException - { + throws JspException { return EVAL_BODY_BUFFERED; } /** - * Reflectively invokes the method specified by the <code>method</code> attribute, + * Reflectively invokes the method specified by the <code>method</code> attribute, * [EMAIL PROTECTED] #findMethod(Object, String, boolean)}. The arguments passed to the method are taken from any nested - * [EMAIL PROTECTED] MethodParameter} tags. When the parameters which are added by the + * [EMAIL PROTECTED] MethodParameter} tags. When the parameters which are added by the * [EMAIL PROTECTED] MethodParameter} tags are [EMAIL PROTECTED] java.lang.String} types, an attempt is made * to convert each of these parameters into the type expected by the method. This * conversion is done using the [EMAIL PROTECTED] TypeUtils#convertToObject(java.lang.String, java.lang.Class)} - * method. If a String can not be converted do the type expected by the method, + * method. If a String can not be converted do the type expected by the method, * an exception is thrown and the error is reported in the tag. Any return value * that results from invoking the given method is passed to the subclass implementation * of the method [EMAIL PROTECTED] #handleReturnValue(java.lang.Object)}. - * + * * @return EVAL_PAGE to continue evaluating the page - * @throws JspException if there are errors. All exceptions that may be thrown - * in the process of reflectively invoking the method and performing type - * conversion are reported as @see javax.servlet.jsp.JspException. + * @throws JspException if there are errors. All exceptions that may be thrown + * in the process of reflectively invoking the method and performing type + * conversion are reported as @see javax.servlet.jsp.JspException. * @see #findMethod(Object, String, boolean) * @see #handleReturnValue(java.lang.Object) * @see MethodParameter @@ -174,77 +166,63 @@ * @see java.lang.String */ public int doEndTag() - throws JspException - { + throws JspException { // find the object on which to invoke the method Object object = null; - try - { + try { object = resolveObject(); - } - catch(ObjectNotFoundException onf) - { + } catch(ObjectNotFoundException onf) { Throwable cause = (onf.getCause() != null ? onf.getCause() : onf); - String msg = Bundle.getErrorString("Tags_AbstractCallMethod_noSuchObject", new Object[] {getObjectName(), _method, cause}); - registerTagError(msg,null); + String msg = Bundle.getErrorString("Tags_AbstractCallMethod_noSuchObject", new Object[]{getObjectName(), _method, cause}); + registerTagError(msg, null); } // if this tag can accept null invocation targets, - if(object == null) - { - if(allowNullInvocationTarget()) - { + if(object == null) { + if(allowNullInvocationTarget()) { // each implementation does this on their own handleReturnValue(null); localRelease(); return EVAL_PAGE; - } - else - { - String msg = Bundle.getErrorString("Tags_AbstractCallMethod_objectIsNull", new Object[] {getObjectName(), _method}); - registerTagError(msg,null); + } else { + String msg = Bundle.getErrorString("Tags_AbstractCallMethod_objectIsNull", new Object[]{getObjectName(), _method}); + registerTagError(msg, null); } } - - if(hasErrors()) - { - reportErrors(); + + if(hasErrors()) { + reportErrors(); localRelease(); return EVAL_PAGE; } - + Method m = findMethod(object, _method, _verifyTypes); - - if(m == null) - { + + if(m == null) { String msg = null; - if(_verifyTypes) - { + if(_verifyTypes) { String paramString = prettyPrintParameterTypes(_parameters); - msg = Bundle.getErrorString("Tags_AbstractCallMethod_noSuchMethodWithTypes", - new Object[] {_method, - (_parameters != null ? new Integer(_parameters.size()) : new Integer(0)), - paramString, - getObjectName()}); - } - else msg = Bundle.getErrorString("Tags_AbstractCallMethod_noSuchMethod", - new Object[] {_method, - (_parameters != null ? new Integer(_parameters.size()) : new Integer(0)), - getObjectName()}); - - registerTagError(msg,null); + msg = Bundle.getErrorString("Tags_AbstractCallMethod_noSuchMethodWithTypes", + new Object[]{_method, + (_parameters != null ? new Integer(_parameters.size()) : new Integer(0)), + paramString, + getObjectName()}); + } else + msg = Bundle.getErrorString("Tags_AbstractCallMethod_noSuchMethod", + new Object[]{_method, + (_parameters != null ? new Integer(_parameters.size()) : new Integer(0)), + getObjectName()}); + + registerTagError(msg, null); reportErrors(); localRelease(); return EVAL_PAGE; } - + Object[] args = null; - try - { + try { args = getArguments(m.getParameterTypes()); - } - catch(IllegalArgumentException iae) - { + } catch(IllegalArgumentException iae) { registerTagError(iae.getMessage(), null); reportErrors(); localRelease(); @@ -253,39 +231,33 @@ // invoke method Object result = null; - try - { - if(_logger.isDebugEnabled()) - { - _logger.debug("method: " + m.toString()); + try { + if(LOGGER.isDebugEnabled()) { + LOGGER.debug("method: " + m.toString()); for(int i = 0; i < args.length; i++) - _logger.debug("arg[" + i + "]: " + (args[i] != null ? args[i].getClass().getName() : "null")); + LOGGER.debug("arg[" + i + "]: " + (args[i] != null ? args[i].getClass().getName() : "null")); } - + result = m.invoke(object, args); - } - catch(Exception e) - { + } catch(Exception e) { assert e instanceof IllegalAccessException || e instanceof InvocationTargetException || e instanceof IllegalArgumentException; - if(_logger.isErrorEnabled()) - _logger.error("Could not invoke method \"" + _method + "\" on the object named \"" + getObjectName() + "\" because: " + e, e); - - if(_failOnError) - { - String msg = Bundle.getErrorString("Tags_AbstractCallMethod_invocationError", new Object[] {_method, getObjectName(), e}); - registerTagError(msg,null); + if(LOGGER.isErrorEnabled()) + LOGGER.error("Could not invoke method \"" + _method + "\" on the object named \"" + getObjectName() + "\" because: " + e, e); + + if(_failOnError) { + String msg = Bundle.getErrorString("Tags_AbstractCallMethod_invocationError", new Object[]{_method, getObjectName(), e}); + registerTagError(msg, null); reportErrors(); localRelease(); return EVAL_PAGE; } } - - if(_logger.isDebugEnabled()) - { - _logger.debug((result != null ? - "return value is non-null and is of type \"" + result.getClass().getName() + "\"" : - "return value is null.")); + + if(LOGGER.isDebugEnabled()) { + LOGGER.debug((result != null ? + "return value is non-null and is of type \"" + result.getClass().getName() + "\"" : + "return value is null.")); } // each implementation handles this differently @@ -299,8 +271,7 @@ /** * Reset all of the fields of this tag. */ - protected void localRelease() - { + protected void localRelease() { super.localRelease(); _parameters = null; _method = null; @@ -310,7 +281,7 @@ } /** - * <p> + * <p/> * Resolve the object on which the method should be invoked. If there are * errors resolving this object, this method will throw an <code>ObjectNotFoundException</code>. * <br/> @@ -318,40 +289,39 @@ * If the object is not found but no exception occurred, this method should return null. * </p> * - * @throws ObjectNotFoundException if an exception occurred attempting to resolve an object * @return the object on which to reflectively invoke the method. + * @throws ObjectNotFoundException if an exception occurred attempting to resolve an object */ protected abstract Object resolveObject() throws ObjectNotFoundException, JspException; /** - * Get the name of the object that is the target of the invocation. This is + * Get the name of the object that is the target of the invocation. This is * a generic method for this tag that enables more specific error reporting. * - * @return a name for the object on which the method will be invoked. + * @return a name for the object on which the method will be invoked. */ protected abstract String getObjectName(); /** - * When implemented to return true, this method allows a tag invoking a method to - * accept a null invocation target and simply return null. The default + * When implemented to return true, this method allows a tag invoking a method to + * accept a null invocation target and simply return null. The default * implementation returns false. * * @return true if the object on which to invoke the method can be null; false otherwise. */ - protected boolean allowNullInvocationTarget() - { + protected boolean allowNullInvocationTarget() { return false; } /** - * <p> - * A method that allows concrete classes to handle the result of the + * <p/> + * A method that allows concrete classes to handle the result of the * reflective invocation in an implementation specific way. * </p> - * <p> + * <p/> * The default beahavior is to set the return value resulting from invoking the method - * in the [EMAIL PROTECTED] javax.servlet.jsp.PageContext} attribute map of the current JSP page. - * The result is set as an attribute if the <code>result</code> is not null and the + * in the [EMAIL PROTECTED] javax.servlet.jsp.PageContext} attribute map of the current JSP page. + * The result is set as an attribute if the <code>result</code> is not null and the * [EMAIL PROTECTED] CallMethod#setResultId(java.lang.String)} String is not null. If the value returned * from calling a method is null and the [EMAIL PROTECTED] CallMethod#setResultId(java.lang.String)} is non-null, * the [EMAIL PROTECTED] javax.servlet.jsp.PageContext#removeAttribute(java.lang.String)} @@ -360,24 +330,20 @@ * * @param result the object that was returned by calling the method on the object */ - protected void handleReturnValue(Object result) - { - if(_resultId != null) - { - if(result != null) - { - if(_logger.isInfoEnabled() && pageContext.getAttribute(_resultId) != null) - _logger.info("Overwriting attribute named \"" + _resultId + "\" in the PageContext with a new attribute of type \"" + - result.getClass().getName() + "\" returned from calling the method \"" + _method + "\" on an object named \"" + - getObjectName() + "\"."); - + protected void handleReturnValue(Object result) { + if(_resultId != null) { + if(result != null) { + if(LOGGER.isInfoEnabled() && pageContext.getAttribute(_resultId) != null) + LOGGER.info("Overwriting attribute named \"" + _resultId + "\" in the PageContext with a new attribute of type \"" + + result.getClass().getName() + "\" returned from calling the method \"" + _method + "\" on an object named \"" + + getObjectName() + "\"."); + pageContext.setAttribute(_resultId, result); - } - else - { - if(_logger.isInfoEnabled()) _logger.info("Removing attribute named \"" + _resultId + "\" from the PageContext. " + - "The value returned from calling the method \"" + _method + "\" on an object named \"" + - getObjectName() + "\" is null."); + } else { + if(LOGGER.isInfoEnabled()) + LOGGER.info("Removing attribute named \"" + _resultId + "\" from the PageContext. " + + "The value returned from calling the method \"" + _method + "\" on an object named \"" + + getObjectName() + "\" is null."); pageContext.removeAttribute(_resultId); } @@ -387,68 +353,60 @@ /** * Internal, read-only property used by subclasses to get * the list of parameters to be used when reflectively - * invoking a method. If the method takes no parameters, this + * invoking a method. If the method takes no parameters, this * list will be of size zero. * * @return the list of parameters */ - protected List getParameterNodes() - { + protected List getParameterNodes() { if(_parameters != null) return _parameters; - else return EMPTY_LIST; + else + return EMPTY_LIST; } /** * The default findMethod implementation is an uncached search of all * of the methods available on the Class of the <code>target</code> - * - * @param target the object from which to find the method - * @param methodName the name of the method to find + * + * @param target the object from which to find the method + * @param methodName the name of the method to find * @param verifyTypes a boolean that if true will match the type names in addition to the String method name - * @return a Method object matching the methodName and types, if <code>verifyTypes</code> is true. + * @return a Method object matching the methodName and types, if <code>verifyTypes</code> is true. * <code>null</code> otherwise. */ - protected Method findMethod(Object target, String methodName, boolean verifyTypes) - { + protected Method findMethod(Object target, String methodName, boolean verifyTypes) { int paramCount = (_parameters != null ? _parameters.size() : 0); Method[] methods = target.getClass().getMethods(); - for(int i = 0; i < methods.length; i++) - { - if(methods[i].getName().equals(_method) && methods[i].getParameterTypes().length == paramCount) - { - if(_logger.isDebugEnabled()) - { - _logger.debug("found method: " + methods[i]); - _logger.debug("check types: " + verifyTypes); + for(int i = 0; i < methods.length; i++) { + if(methods[i].getName().equals(_method) && methods[i].getParameterTypes().length == paramCount) { + if(LOGGER.isDebugEnabled()) { + LOGGER.debug("found method: " + methods[i]); + LOGGER.debug("check types: " + verifyTypes); } // page asked to check types - if(verifyTypes) - { + if(verifyTypes) { boolean match = true; // the lengths of these match b/c of the check above Class[] parameterTypes = methods[i].getParameterTypes(); - for(int j = 0; j < parameterTypes.length; j++) - { - if(_logger.isDebugEnabled()) - { - _logger.debug("parameterTypes[" + j + "]: " + parameterTypes[j]); - _logger.debug("paramNode[" + j + "]: " + ((ParamNode)_parameters.get(j)).typeName); + for(int j = 0; j < parameterTypes.length; j++) { + if(LOGGER.isDebugEnabled()) { + LOGGER.debug("parameterTypes[" + j + "]: " + parameterTypes[j]); + LOGGER.debug("paramNode[" + j + "]: " + ((ParamNode)_parameters.get(j)).typeName); } // check the name of the class and the name of the parameter type - if(!parameterTypes[j].getName().equals(((ParamNode)_parameters.get(j)).typeName)) - { + if(!parameterTypes[j].getName().equals(((ParamNode)_parameters.get(j)).typeName)) { match = false; break; } - + } if(match) return methods[i]; - } - else return methods[i]; + } else + return methods[i]; } } @@ -461,102 +419,95 @@ * provided here. * * @return an Object[] that contains the parameters to pass to the method - * @throws IllegalArgumentException if an error occurs converting an - * argument to a specific type. + * @throws IllegalArgumentException if an error occurs converting an + * argument to a specific type. */ - private final Object[] getArguments(Class[] paramTypes) - { + private final Object[] getArguments(Class[] paramTypes) { if(_parameters == null) return EMPTY_ARGS; Object[] args = new Object[paramTypes.length]; - for(int i = 0; i < _parameters.size(); i++) - { + for(int i = 0; i < _parameters.size(); i++) { ParamNode pn = (ParamNode)_parameters.get(i); // if the parameter should have been null, leave it null if(pn.paramValue == MethodParameter.NULL_ARG) continue; Object value = pn.paramValue; - try - { + try { // if the value wasn't a String, it may have come from XScript so don't try to convert it if(!(value instanceof String) || value == null) args[i] = value; // here, there's a non-null String value - else args[i] = TypeUtils.convertToObject((String)value, paramTypes[i]); + else + args[i] = TypeUtils.convertToObject((String)value, paramTypes[i]); } - // catch Exception here because almost anything can be thrown by TypeUtils.convertToObject(). - catch(Exception e) - { - String msg = Bundle.getErrorString("Tags_AbstractCallMethod_parameterError", - new Object[] {paramTypes[i], new Integer(i), value, e.toString()}); + // catch Exception here because almost anything can be thrown by TypeUtils.convertToObject(). + catch(Exception e) { + String msg = Bundle.getErrorString("Tags_AbstractCallMethod_parameterError", + new Object[]{paramTypes[i], new Integer(i), value, e.toString()}); throw new IllegalArgumentException(msg); } - if(_logger.isDebugEnabled()) _logger.debug("argTypes[" + i + "]: " + paramTypes[i]); + if(LOGGER.isDebugEnabled()) LOGGER.debug("argTypes[" + i + "]: " + paramTypes[i]); } return args; } /** - * Utility method that pretty-prints the types of the parameters + * Utility method that pretty-prints the types of the parameters * passed to a method; this is used in debugging. * - * @param parameters the list of parameters + * @param parameters the list of parameters * @return a String that represents the types of each of these paramters in order */ - private static final String prettyPrintParameterTypes(List parameters) - { + private static final String prettyPrintParameterTypes(List parameters) { StringBuilder paramString = null; - if(parameters != null) - { + if(parameters != null) { paramString = new StringBuilder(128); paramString.append("("); - for(int i = 0; i < parameters.size(); i++) - { + for(int i = 0; i < parameters.size(); i++) { if(i > 0) paramString.append(", "); - + paramString.append(((ParamNode)parameters.get(i)).typeName); } paramString.append(")"); return paramString.toString(); - } - else return EMPTY_STRING; + } else + return EMPTY_STRING; } /** - * An internal struct that represents a parameter that will be passed to a + * An internal struct that represents a parameter that will be passed to a * reflective method invocation call. Instances of <code>ParamNode</code> * map 1:1 to the methodParameter tags that appear within the body of * an AbstrctCallMethod tag. * * @exclude */ - protected class ParamNode - { + protected class ParamNode { + /** * The fully qualified class name of the parameter type. This value * can be null if parameter type checking does not need to occur. */ public String typeName = null; - + /** - * The value of the parameter. Often, this is a String expression - * which is evaluated later and converted into some Object + * The value of the parameter. Often, this is a String expression + * which is evaluated later and converted into some Object * type such as Integer or Foobar. */ public Object paramValue = null; - - public String toString() - { + + public String toString() { StringBuilder buf = new StringBuilder(32); buf.append("typeName: ").append(typeName); return buf.toString(); } } - } +} Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallMethod.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallMethod.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallMethod.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallMethod.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallMethod.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallMethod.java Wed Jan 19 11:00:31 2005 @@ -26,73 +26,69 @@ import java.util.List; /** - * <p> + * <p/> * An abstract base class for tags that are capable of reflectively * invoking methods. Specializations of this tag provide method - * implementations that locate the object on which to invoke the - * method and that handle any return value from the invoked + * implementations that locate the object on which to invoke the + * method and that handle any return value from the invoked * method. * </p> - * <p> - * The <code>CallMethod</code> tag can have child tags of type + * <p/> + * The <code>CallMethod</code> tag can have child tags of type * [EMAIL PROTECTED] MethodParameter}; these tags must be in the same - * order as the parameter list in the method signature of the - * method that will be invoked. To invoke an overloaded method, the + * order as the parameter list in the method signature of the + * method that will be invoked. To invoke an overloaded method, the * [EMAIL PROTECTED] MethodParameter#setType(String)} property must be set to the String * name of the type to pass to the method. If the type attribute values - * on nested [EMAIL PROTECTED] MethodParameter} tags do not match any method signature, + * on nested [EMAIL PROTECTED] MethodParameter} tags do not match any method signature, * an error will be reported in the page. * </p> - - * - * @jsptagref.tagdescription - * Calls methods on any Java classes. - * <p>The <code>controlId</code> attribute is used to specify the cclass to be called. - * The value returned is stored in the - * <code>{pageContext...}</code> data binding context object under the + * + * @jsptagref.tagdescription Calls methods on any Java classes. + * <p>The <code>controlId</code> attribute is used to specify the cclass to be called. + * The value returned is stored in the + * <code>{pageContext...}</code> data binding context object under the * attribute specified by the <code>resultId</code> * attribute. - * + * <p/> * <p>For example, if you call a Java class with the following <netui-data:callMethod> tag... - * - * <pre> <netui-data:callMethod - * object="{pageFlow}" - * method="hello" - * <b>resultId="helloMessage"</b> + * <p/> + * <pre> <netui-data:callMethod + * object="{pageFlow}" + * method="hello" + * <b>resultId="helloMessage"</b> * /></pre> - * - * <p>...the result of the call is stored in the <code>{pageContext...}</code> data binding context under the - * attribute <code>helloMessage</code>. - * - * <p>The result can be retrieved with the data binding expression + * <p/> + * <p>...the result of the call is stored in the <code>{pageContext...}</code> data binding context under the + * attribute <code>helloMessage</code>. + * <p/> + * <p>The result can be retrieved with the data binding expression * <code>{pageContext.helloMessage}</code> - * + * <p/> * <pre> <netui:label value="<b>{pageContext.helloMessage}</b>"/></pre> - * - * In a scriptlet, the result can be retrieved by calling the <code>getAttribute()</code> + * <p/> + * In a scriptlet, the result can be retrieved by calling the <code>getAttribute()</code> * method on the * [EMAIL PROTECTED] javax.servlet.jsp.PageContext javax.servlet.jsp.PageContext} object: - * + * <p/> * <pre> <%= pageContext.getAttribute("helloMessage") %></pre> - * - * <p>Note that only synchronous methods can be called with <netui-data:callMethod>. + * <p/> + * <p>Note that only synchronous methods can be called with <netui-data:callMethod>. * For handling asynchronous methods * see the help topic <a href="[EMAIL PROTECTED]/../guide/netui/guide/conCallingAWebServiceFromAPageFlow.html"> * Calling Web Services and Custom Java Controls From A Page Flow</a> - * - * @see MethodParameter - * @see CallPageFlow - * @see javax.servlet.jsp.PageContext - * * @netui:tag name="callMethod" description="Use this tag to call a method on an object." * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.CallMethodRenderer" requiredchild="methodParameter" + * @see MethodParameter + * @see CallPageFlow + * @see javax.servlet.jsp.PageContext */ public class CallMethod - extends AbstractCallMethod -{ + extends AbstractCallMethod { + private static final String DEFAULT_OBJECT_NAME = Bundle.getString("Tags_CallMethod_defaultObjectName"); private static final MethodCache _cache = new MethodCache(); - + private Object _object = null; /** @@ -101,64 +97,51 @@ * * @return a constant String representing the name of this tag. */ - public String getTagName() - { + public String getTagName() { return "CallMethod"; } /** * Set the object on which to invoke a method. - * + * * @param object the object on which to invoke a method - * - * @jsptagref.attributedescription - * A string or data binding expression that names the class on which to call a method. - * + * @jsptagref.attributedescription A string or data binding expression that names the class on which to call a method. * @jsptagref.databindable Read Only - * * @jsptagref.attributesyntaxvalue <i>string_or_expression_object</i> - * * @netui:attribute required="false" rtexprvalue="true" */ - public void setObject(Object object) - { + public void setObject(Object object) { _object = object; } /** * Reset all of the fields of this tag. */ - protected void localRelease() - { + protected void localRelease() { super.localRelease(); _object = null; } - protected Object resolveObject() - throws ObjectNotFoundException, JspException - { - return _object; + protected Object resolveObject() + throws ObjectNotFoundException, JspException { + return _object; } - protected final Method findMethod(Object target, String methodName, boolean verifyTypes) - { + protected final Method findMethod(Object target, String methodName, boolean verifyTypes) { List params = getParameterNodes(); - if(verifyTypes) - { + if(verifyTypes) { String[] argTypes = null; argTypes = new String[params.size()]; - for(int i = 0; i < argTypes.length; i++) - { + for(int i = 0; i < argTypes.length; i++) { argTypes[i] = ((ParamNode)params.get(i)).typeName; } - return _cache.getMethod(target.getClass(), methodName, argTypes); - } - else return _cache.getMethod(target.getClass(), methodName, params.size()); + return _cache.getMethod(target.getClass(), methodName, argTypes); + } else + return _cache.getMethod(target.getClass(), methodName, params.size()); } - - protected String getObjectName() - { + + protected String getObjectName() { return DEFAULT_OBJECT_NAME; } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallPageFlow.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallPageFlow.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallPageFlow.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallPageFlow.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallPageFlow.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallPageFlow.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.tags.databinding.invoke; // java imports + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -33,73 +34,67 @@ /** * A tag that is used to call a method on the current [EMAIL PROTECTED] org.apache.beehive.netui.pageflow.PageFlowController}. - * The PageFlow on which to call the method is found given the location of the JSP page in the - * webapp; if no PageFlow is found in the current directory, an [EMAIL PROTECTED] ObjectNotFoundException} is - * thrown and the tag execution fails. + * The PageFlow on which to call the method is found given the location of the JSP page in the + * webapp; if no PageFlow is found in the current directory, an [EMAIL PROTECTED] ObjectNotFoundException} is + * thrown and the tag execution fails. * <p>This tag extends the [EMAIL PROTECTED] CallMethod} tag, which defines additional attributes.</p> - * <p>Once the method has been called, any return value is set in the + * <p>Once the method has been called, any return value is set in the * [EMAIL PROTECTED] javax.servlet.jsp.PageContext} attribute map under the <code>resultId</code> * attribute that is provided on the [EMAIL PROTECTED] CallMethod} tag. In the case that the return - * value is a primitive type, the primitive type's object wrapper is set in the + * value is a primitive type, the primitive type's object wrapper is set in the * <code>PageContext</code> under the <code>resultId</code> key.</p> * - - * - * @jsptagref.tagdescription - * Calls methods on the Controller file (= JPF file) in the same directory - * as the JSP page. If no Controller file - * is found, an [EMAIL PROTECTED] ObjectNotFoundException} is - * thrown and the tag execution fails. - * Any return value is stored in the - * <code>{pageContext...}</code> data binding context object under the + * @jsptagref.tagdescription Calls methods on the Controller file (= JPF file) in the same directory + * as the JSP page. If no Controller file + * is found, an [EMAIL PROTECTED] ObjectNotFoundException} is + * thrown and the tag execution fails. + * Any return value is stored in the + * <code>{pageContext...}</code> data binding context object under the * attribute specified by the <code>resultId</code> * attribute. - * + * <p/> * <p>For example, if you call the <code>hello</code> method with the following <netui-data:callPageFlow> tag... - * + * <p/> * <pre> <netui-data:callPageFlow - * method="hello" - * <b>resultId="helloMessage"</b> + * method="hello" + * <b>resultId="helloMessage"</b> * /></pre> - * - * <p>...the result of the call is stored in the <code>{pageContext...}</code> data binding context under the - * attribute <code>helloMessage</code>. - * - * <p>The result can be retrieved with the data binding expression + * <p/> + * <p>...the result of the call is stored in the <code>{pageContext...}</code> data binding context under the + * attribute <code>helloMessage</code>. + * <p/> + * <p>The result can be retrieved with the data binding expression * <code>{pageContext.helloMessage}</code> - * + * <p/> * <pre> <netui:label value="<b>{pageContext.helloMessage}</b>"/></pre> - * - * In a scriptlet, the result can be retrieved by calling the <code>getAttribute()</code> + * <p/> + * In a scriptlet, the result can be retrieved by calling the <code>getAttribute()</code> * method on the * [EMAIL PROTECTED] javax.servlet.jsp.PageContext javax.servlet.jsp.PageContext} object: - * + * <p/> * <pre> <%= pageContext.getAttribute("helloMessage") %></pre> - * - * <p>Note that only synchronous methods can be called with <netui-data:callPageFlow>. + * <p/> + * <p>Note that only synchronous methods can be called with <netui-data:callPageFlow>. * For handling asynchronous methods * see the help topic <a href="[EMAIL PROTECTED]/../guide/netui/guide/conCallingAWebServiceFromAPageFlow.html"> * Calling Web Services and Custom Java Controls From A Page Flow</a> - * - * @example - * In the following sample, the <netui-data:callPageFlow> tag calls the - * sumCartItems method on the Controller file. The + * @example In the following sample, the <netui-data:callPageFlow> tag calls the + * sumCartItems method on the Controller file. The * [EMAIL PROTECTED] org.apache.beehive.netui.tags.html.Label} tag * accesses the result through the {pageContext...} data binding context. - * <pre> <netui-data:callPageFlow method="sumCartItems" resultId="cartSum"> + * <pre> <netui-data:callPageFlow method="sumCartItems" resultId="cartSum"> * <netui-data:methodParameter value="{pageFlow.cart.lineItemList}"/> * </netui-data:callPageFlow> * ... * <netui:label value="{pageContext.cartSum}"/></pre> - * * @netui:tag name="callPageFlow" description="Use this tag to call a method on the current page flow controller." * @netui.tldx:tag requiredchild="methodParameter" renderer="workshop.netui.jspdesigner.tldx.compat.CallPageFlowRenderer" - * deprecated="true" + * deprecated="true" */ public class CallPageFlow - extends CallMethod -{ - private static final Logger _logger = Logger.getInstance(CallPageFlow.class); + extends CallMethod { + + private static final Logger LOGGER = Logger.getInstance(CallPageFlow.class); private static final String DEFAULT_OBJECT_NAME = Bundle.getString("Tags_CallPageFlow_defaultObjectName"); /** @@ -108,46 +103,40 @@ * * @return a constant String representing the name of this tag. */ - public String getTagName() - { + public String getTagName() { return "CallPageFlow"; } /** - * Get the name of the object that is the target of the invocation. + * Get the name of the object that is the target of the invocation. * - * @return a name for the object on which the method will be invoked. + * @return a name for the object on which the method will be invoked. */ - protected String getObjectName() - { + protected String getObjectName() { return DEFAULT_OBJECT_NAME; } /** - * Get the PageFlow for the using JSP's directory. This is an implementation of the - * [EMAIL PROTECTED] CallMethod#resolveObject()} method that finds the current PageFlow + * Get the PageFlow for the using JSP's directory. This is an implementation of the + * [EMAIL PROTECTED] CallMethod#resolveObject()} method that finds the current PageFlow * using the [EMAIL PROTECTED] PageFlowUtils#getCurrentPageFlow} method. * + * @return the current PageFlow. If there is no current PageFlow, the [EMAIL PROTECTED] ObjectNotFoundException} will + * be thrown. * @throws ObjectNotFoundException when an exception occurs ensuring that a Page Flow is created. - * @return the current PageFlow. If there is no current PageFlow, the [EMAIL PROTECTED] ObjectNotFoundException} will - * be thrown. */ protected Object resolveObject() - throws ObjectNotFoundException - { - try - { + throws ObjectNotFoundException { + try { // TODO: because of a javac bug (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5090006), we // can't call PageFlowUtils.getCurrentPageFlow here; thus, the call to getCurrentActionResolver. Object jpf = PageFlowUtils.getCurrentActionResolver((HttpServletRequest)pageContext.getRequest()); - - if(_logger.isDebugEnabled()) - _logger.debug("Found a pageflow of type: " + (jpf != null ? jpf.getClass().getName() : "null")); + + if(LOGGER.isDebugEnabled()) + LOGGER.debug("Found a pageflow of type: " + (jpf != null ? jpf.getClass().getName() : "null")); return jpf; - } - catch(Exception e) - { + } catch(Exception e) { throw new ObjectNotFoundException(Bundle.getErrorString("Tags_CallPageFlow_noPageFlow"), e); } } 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&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/MethodParameter.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/MethodParameter.java&r2=125643 ============================================================================== --- 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 Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.tags.databinding.invoke; // java imports + import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.Tag; @@ -31,36 +32,35 @@ /** * A tag that is used to add an argument to a method that will be called * on some object. This tag can be nested within tags that extend the AbstractCallMethod - * class. Those tags are: + * class. Those tags are: * <ul> * <li><netui-data:callControl></li> * <li><netui-data:callMethod></li> * <li><netui-data:callPageFlow></li> * <li><netui-data:choiceMethod></li> * </ul> - * <p> + * <p/> * The <code>methodParameter</code> tags are used to parameterize the method * that the [EMAIL PROTECTED] AbstractCallMethod} class will call; each <code>methodParameter</code> * tag represents a single parameter. These tags are evaluated in order and the parameters * they describe are passed in order.</p> - * <p> + * <p/> * Overloaded methods on an object can be invoked by setting the <code>type</code> - * attribute on each <code>methodParameter</code> tag that is embedded in + * attribute on each <code>methodParameter</code> tag that is embedded in * a method invocation tag. The type name must exactly match the primitive - * type name or the fully qualified class name of the argument. The + * type name or the fully qualified class name of the argument. The * <code>methodParameter</code> tags must also be in the order that they * will be passed to this method. The value of the type attribute must be - * an exact match of the type if it were printed after having been + * an exact match of the type if it were printed after having been * accessed through Java reflection.</p> - * <p> - * In order to pass <code>null</code> as an argument to a method, the + * <p/> + * In order to pass <code>null</code> as an argument to a method, the * null attribute must be set on this tag. Either the null attribute or the * value attribute must be set on this tag.</p> - - * @jsptagref.tagdescription - * Provides an argument to a method-calling tag. + * + * @jsptagref.tagdescription Provides an argument to a method-calling tag. * The <netui-data:methodParameter> tag can be nested within the following - * method-calling tags: + * method-calling tags: * <blockquote> * <ul> * <li>[EMAIL PROTECTED] org.apache.beehive.netui.tags.databinding.invoke.CallControl}</li> @@ -68,59 +68,56 @@ * <li>[EMAIL PROTECTED] org.apache.beehive.netui.tags.databinding.invoke.CallPageFlow}</li> * </ul> * </blockquote> - * - * <p> + * <p/> + * <p/> * Each <netui-data:methodParameter> * tag represents a single parameter. A group of <netui-data:methodParameter> * tags are evaluated in order and the parameters * they describe are passed in order.</p> - * - * <p> + * <p/> + * <p/> * Overloaded methods on an object can be invoked by setting the <code>type</code> - * attribute on each <netui-data:methodParameter> tag that is embedded in + * attribute on each <netui-data:methodParameter> tag that is embedded in * a method-calling tag. The type name must exactly match the primitive - * type name or the fully qualified class name of the argument. The + * type name or the fully qualified class name of the argument. The * <netui-data:methodParameter> tags must also be in the order that they * will be passed to the method. The value of the <code>type</code> attribute must be - * an exact match of the type as if it were printed after having been + * an exact match of the type as if it were printed after having been * accessed through Java reflection.</p> - * - * <p> - * In order to pass <code>NULL</code> as an argument to a method, the - * <code>null</code> attribute must be set on this tag. Either the <code>null</code> + * <p/> + * <p/> + * In order to pass <code>NULL</code> as an argument to a method, the + * <code>null</code> attribute must be set on this tag. Either the <code>null</code> * attribute or the * <code>value</code> attribute must be set on this tag.</p> - * - * @example - * The following sample shows how to pass parameters to the method call + * @example The following sample shows how to pass parameters to the method call * <code>foo(int integer, String string)</code>. - * + * <p/> * <pre> <netui-data:methodParamter value="42"/> * <netui-data:methodParamter null="true"/></pre> - * + * <p/> * This will correspond to the method call:<br/> - * + * <p/> * <pre> foo(42, null);</pre> - * + * <p/> * The following sample shows how to pass parameters to the method call * <code>foo(int integer, String string)</code> * where the class has both of the methods <code>foo(int integer, String string)</code> * and <code>foo(Integer integer, String string)</code>. - * + * <p/> * <pre> <netui-data:methodParamter type="int" value="42"/> * <netui-data:methodParamter type="java.lang.String" null="true"/></pre> - * + * <p/> * This will correspond to the method call:</p> * <pre> foo(42, null);</pre> - * * @netui:tag name="methodParameter" description="Use this tag to add an argument to a method that will be called on some object." - * @netui.tldx:tag requiredparent="choiceMethod callPageFlow callControl callMethod" requiredchild="#nothing" - * renderer="workshop.netui.jspdesigner.tldx.MethodParameterRenderer" - * bodycontentpref="empty" + * @netui.tldx:tag requiredparent="choiceMethod callPageFlow callControl callMethod" requiredchild="#nothing" + * renderer="workshop.netui.jspdesigner.tldx.MethodParameterRenderer" + * bodycontentpref="empty" */ public class MethodParameter - extends AbstractClassicTag -{ + extends AbstractClassicTag { + /** * An identifier denoting that the value of this method parameter * should be treated as 'null'. @@ -134,8 +131,7 @@ /** * Reset all of the fields of this tag. */ - protected void localRelease() - { + protected void localRelease() { super.localRelease(); _isNull = false; _value = null; @@ -148,21 +144,20 @@ * * @return a constant String representing the name of this tag. */ - public String getTagName() - { + public String getTagName() { return "MethodParamter"; } /** - * <p> + * <p/> * Set a String matching the type of this parameter on the method to invoke. * </p> - * <p> + * <p/> * This name should match the primitive type name or fully qualified class * name of the parameters on the signature of the method to which this - * parameter will be passed. + * parameter will be passed. * </p> - * <p> + * <p/> * For example: * <table> * <tr><td>Method Signature</td><td>Argument Name</td><td>Type value</td></tr> @@ -171,125 +166,102 @@ * </table> * * @param type the type name - * - * @jsptagref.attributedescription - * <p> + * @jsptagref.attributedescription <p> * Set a String matching the type of this parameter on the method to invoke. * </p> - * <p> + * <p/> * This name should match the primitive type name or fully qualified class * name of the parameters on the signature of the method to which this - * parameter will be passed. + * parameter will be passed. * </p> - * <p> + * <p/> * For example: * <table border='1'> * <tr><td><b>Method Signature</b></td><td><b>Argument Name</b></td><td><b>Type value</b></td></tr> * <tr><td>addToPrice(int price)</td><td>price</td><td><code>int</code></td></tr> * <tr><td>addToPrice(Integer price)</td><td>price</td><td><code>java.lang.Integer</code></td></tr> * </table> - * * @jsptagref.databindable false - * * @jsptagref.attributesyntaxvalue <i>string_type</i> - * * @netui:attribute required="false" */ - public void setType(String type) - { + public void setType(String type) { _type = type; } /** - * Sets the value of the method parameter that will be passed + * Sets the value of the method parameter that will be passed * to the method call. This String can be an expression. - * If the value is not an expression that references + * If the value is not an expression that references * an Ojbect, the [EMAIL PROTECTED] AbstractCallMethod#doEndTag()} will attempt to convert * the String to type that matches the position of the MethodParameter * tag in the list of MethodParameter tags nested inside of an [EMAIL PROTECTED] AbstractCallMethod} * tag. * * @param value a String value which may be an expression - * - * @jsptagref.attributedescription - * The value of the method parameter that will be passed - * to the method call. - * + * @jsptagref.attributedescription The value of the method parameter that will be passed + * to the method call. * @jsptagref.databindable true - * * @jsptagref.attributesyntaxvalue <i>expression_value</i> - * * @netui:attribute required="false" rtexprvalue="true" */ - public void setValue(Object value) - { + public void setValue(Object value) { _value = value; } /** * Sets a boolean that describes that the parameter that should be passed - * to the method is null. + * to the method is null. * * @param isNull a value that describes whether or not this tag should pass null; if - * <code>true</code> null will be passed; otherwise the value from the value attribute - * will be passed. - * - * @jsptagref.attributedescription - * Boolean. Determines if the parameter passed to the method is null. - * + * <code>true</code> null will be passed; otherwise the value from the value attribute + * will be passed. + * @jsptagref.attributedescription Boolean. Determines if the parameter passed to the method is null. * @jsptagref.databindable false - * * @jsptagref.attributesyntaxvalue <i>boolean_passNullValue</i> - * * @netui:attribute required="false" */ - public void setNull(boolean isNull) - { + public void setNull(boolean isNull) { _isNull = isNull; } /** * Start this tag's lifecycle. Verify that this tag is nested within - * a [EMAIL PROTECTED] AbstractCallMethod} tag and that one of the "null" and "value" + * a [EMAIL PROTECTED] AbstractCallMethod} tag and that one of the "null" and "value" * attributes are set. * - * @return SKIP_BODY + * @return SKIP_BODY * @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)) - { + if(parent == null || !(parent instanceof AbstractCallMethod)) { String msg = Bundle.getErrorString("Tags_MethodParameter_invalidParent"); - registerTagError(msg,null); + registerTagError(msg, null); reportErrors(); return SKIP_BODY; } - if(_isNull == false && _value == null) - { + if(_isNull == false && _value == null) { String msg = Bundle.getErrorString("Tags_MethodParameter_undefinedValue"); - registerTagError(msg,null); + registerTagError(msg, null); reportErrors(); return SKIP_BODY; } - + return SKIP_BODY; } /** * Prepare the value to pass up to the [EMAIL PROTECTED] AbstractCallMethod} type - * parent. - * + * parent. + * * @return EVAL_PAGE to continue evaluating the page */ public int doEndTag() - throws JspException - { - if(!hasErrors()) - { + throws JspException { + if(!hasErrors()) { AbstractCallMethod cm = (AbstractCallMethod)getParent(); if(_isNull || _value == null) cm.addParameter(_type, null); @@ -299,7 +271,7 @@ if(hasErrors()) reportErrors(); - + localRelease(); return EVAL_PAGE; } 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&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/ObjectNotFoundException.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/ObjectNotFoundException.java&r2=125643 ============================================================================== --- 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 Wed Jan 19 11:00:31 2005 @@ -28,57 +28,63 @@ * be found. The [EMAIL PROTECTED] CallMethod#resolveObject()} call throws this exception. */ public class ObjectNotFoundException - extends Exception -{ + extends Exception { + private String _objectName = null; /** * Construct an ObjectNotFoundException. */ - public ObjectNotFoundException() {super();} + public ObjectNotFoundException() { + super(); + } /** * Construct an ObjectNotFoundException with the given message. * * @param message a String containing the text of the exception message */ - public ObjectNotFoundException(String message) {super(message);} + public ObjectNotFoundException(String message) { + super(message); + } /** * Construct an ObjectNotFoundException with the given cause * * @param cause a <code>Throwable</code> that interfered with the normal lookup of an object. */ - public ObjectNotFoundException(Throwable cause) {super(cause);} - + public ObjectNotFoundException(Throwable cause) { + super(cause); + } + /** * Construct an ObjectNotFoundException with the given <code>message</code> and <code>cause</code>. * * @param message a String containing the text of the exception message - * @param cause a <code>Throwable</code> that interfered with the normal lookup of an object. + * @param cause a <code>Throwable</code> that interfered with the normal lookup of an object. */ - public ObjectNotFoundException(String message, Throwable cause) {super(message, cause);} + public ObjectNotFoundException(String message, Throwable cause) { + super(message, cause); + } /** * Construct an ObjectNotFoundException with the given <code>message</code>, <code>cause</code>, and <code>objectName</code>. * - * @param message a String containing the text of the exception message - * @param cause a <code>Throwable</code> that interfered with the normal lookup of an object. + * @param message a String containing the text of the exception message + * @param cause a <code>Throwable</code> that interfered with the normal lookup of an object. * @param objectName the identifier of the object which could not be looked-up. */ - public ObjectNotFoundException(String message, Throwable cause, String objectName) - { + public ObjectNotFoundException(String message, Throwable cause, String objectName) { super(message, cause); _objectName = objectName; } - + /** * Get the name of the object whose lookup failed. * * @return the String name */ - public String getObjectName() - { + public String getObjectName() { return _objectName; } } 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&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/Message.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/Message.java&r2=125643 ============================================================================== --- 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 Wed Jan 19 11:00:31 2005 @@ -25,27 +25,24 @@ /** * Tag handler class for the <netui-data:message> tag. Provides a message schema, which can be parameterized with message content. - * - * @jsptagref.tagdescription - * This tag provides a message schema, which can be parameterized to + * + * @jsptagref.tagdescription This tag provides a message schema, which can be parameterized to * construct customizable messages. - * + * <p/> * <p>Curly-braces are used to identify argument place holders in the schema: - * + * <p/> * <pre> <% * pageContext.setAttribute("msgSkeleton", new String("Hello {0}. {1} {2}, the current date and time are {3}.")); * %> * <netui-data:message value="{pageContext.msgSkeleton}" resultId="message"></pre> - * - * @example - * Defines a message schema, while the + * @example Defines a message schema, while the * [EMAIL PROTECTED] org.apache.beehive.netui.tags.databinding.message.MessageArg} tags - * provide the parameters that plug values into the schema. + * provide the parameters that plug values into the schema. * In the following example, the <netui-data:message> tag * uses the <code>value</code> attribute to bind to the message schema (which * was earlier added to the - * [EMAIL PROTECTED] javax.servlet.jsp.PageContext javax.servlet.jsp.PageContext} object. - * The two <netui-data:messageArg> tags provide the parameters to plug into the + * [EMAIL PROTECTED] javax.servlet.jsp.PageContext javax.servlet.jsp.PageContext} object. + * The two <netui-data:messageArg> tags provide the parameters to plug into the * schema. * <pre> <% * pageContext.setAttribute("msgSkeleton", new String("To read about {0}, go to {1}.")); @@ -57,125 +54,100 @@ * </netui-data:message> * ... * <netui:label value="{pageContext.message}"/></pre> - * + * <p/> * <p>The following message is output to the JSP page:<p> - * + * <p/> * <pre> To read about messaging, go to my web page.</pre> - * - * @netui:tag name="message" - * description="Allows you to format messages according to any sequence you want, using one or more values from arguments defined in MessageArg tag(s). The results are available to the page context." + * @netui:tag name="message" + * description="Allows you to format messages according to any sequence you want, using one or more values from arguments defined in MessageArg tag(s). The results are available to the page context." * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.MessageRenderer" requiredchild="messageArg" - * whitespace="indent" + * whitespace="indent" */ -public class Message - extends AbstractClassicTag -{ +public class Message + extends AbstractClassicTag { + public static final String MESSAGE_ARG_KEY = "netui_bundleMessageArguments"; private String _resultId = null; private Object _value = null; private List _argList = null; - public String getTagName() - { + public String getTagName() { return "Message"; } /** - * - * @jsptagref.attributedescription - * The id of the resulting string. - * + * @jsptagref.attributedescription The id of the resulting string. * @jsptagref.databindable false - * * @jsptagref.attributesyntaxvalue <i>string_result</i> - * * @netui:attribute required="true" */ - public void setResultId(String resultId) - { + public void setResultId(String resultId) { _resultId = resultId; } /** - * - * @jsptagref.attributedescription - * A {pageContext...} or {request...} databinding expression. - * + * @jsptagref.attributedescription A {pageContext...} or {request...} databinding expression. * @jsptagref.databindable true - * * @jsptagref.attributesyntaxvalue <i>expression_value</i> - * * @netui:attribute required="true" rtexprvalue="true" */ - public void setValue(Object value) - { + public void setValue(Object value) { _value = value; } - public int doStartTag() - { + public int doStartTag() { return EVAL_BODY_BUFFERED; } public int doEndTag() - throws JspException - { + throws JspException { Object[] args = (_argList != null ? _argList.toArray() : null); - if(hasErrors()) - { + if(hasErrors()) { reportErrors(); localRelease(); return EVAL_PAGE; } - - if(_value == null) - { + + if(_value == null) { localRelease(); return EVAL_PAGE; } Object exprVal = null; - try - { + 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); + registerTagError(msg, null); } - - if(hasErrors()) - { + + if(hasErrors()) { reportErrors(); localRelease(); return EVAL_PAGE; } - + Message msgParent = null; // if nested in a <netui-data:message ... /> tag, add the result of this tag as an argument. - if((msgParent = (Message)findAncestorWithClass(this, Message.class)) != null) - { + if((msgParent = (Message)findAncestorWithClass(this, Message.class)) != null) { msgParent.addMessageArgument(exprVal); - } - else pageContext.setAttribute(_resultId, exprVal); + } else + pageContext.setAttribute(_resultId, exprVal); localRelease(); return EVAL_PAGE; } - public void addMessageArgument(Object messageArgument) - { + public void addMessageArgument(Object messageArgument) { if(_argList == null) _argList = new ArrayList(); - + _argList.add(messageArgument); } - protected void localRelease() - { + protected void localRelease() { super.localRelease(); _argList = null; _value = null; 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&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/MessageArg.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/MessageArg.java&r2=125643 ============================================================================== --- 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 Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.tags.databinding.message; // java imports + import javax.servlet.jsp.JspException; import javax.servlet.jsp.PageContext; @@ -25,78 +26,65 @@ import org.apache.beehive.netui.tags.AbstractClassicTag; // external imports + /** * Tag handler class for the <netui-data:messageArg> tag. Provides message for the [EMAIL PROTECTED] Message} tag. - * - * @jsptagref.tagdescription - * Provides a parameter value to a message schema. - * + * + * @jsptagref.tagdescription Provides a parameter value to a message schema. + * <p/> * <p>The message schema is defined by a [EMAIL PROTECTED] Message} tag. - * - * @example - * <p>For an example that uses the <netui-data:messageArg> + * @example <p>For an example that uses the <netui-data:messageArg> * tag, see the [EMAIL PROTECTED] Message} description. - * - * @netui:tag name="messageArg" - * description="Allows you to set values that are used as arguments to the Message tag. The formatted message results are available to the page context." - * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.MessageArgRenderer" - * requiredparent="message" - * requiredchild="#nothing" - * bodycontentpref="empty" - * whitespace="indent" + * @netui:tag name="messageArg" + * description="Allows you to set values that are used as arguments to the Message tag. The formatted message results are available to the page context." + * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.MessageArgRenderer" + * requiredparent="message" + * requiredchild="#nothing" + * bodycontentpref="empty" + * whitespace="indent" */ public class MessageArg - extends AbstractClassicTag -{ + extends AbstractClassicTag { + private Object _value = null; - public String getTagName() - { + public String getTagName() { return "MessageArg"; } /** - * - * @jsptagref.attributedescription - * A string value for the argument. - * + * @jsptagref.attributedescription A string value for the argument. * @jsptagref.databindable false - * * @jsptagref.attributesyntaxvalue <i>string_argument</i> - * * @netui:attribute required="true" rtexprvalue="true" */ - public void setValue(Object value) - { + public void setValue(Object value) { this._value = value; } public int doStartTag() - throws JspException - { + throws JspException { // verify parent tag - if(!(getParent() instanceof Message)) - { + if(!(getParent() instanceof Message)) { throw new JspException("Invalid Parent"); } - + return EVAL_BODY_BUFFERED; } public int doEndTag() - throws JspException - { + throws JspException { if(hasErrors()) reportErrors(); - else ((Message)getParent()).addMessageArgument(_value); + else + ((Message)getParent()).addMessageArgument(_value); localRelease(); - + return EVAL_PAGE; } - protected void localRelease() - { + protected void localRelease() { super.localRelease(); _value = null; } 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&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/pageinput/DeclarePageInput.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/pageinput/DeclarePageInput.java&r2=125643 ============================================================================== --- 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 Wed Jan 19 11:00:31 2005 @@ -28,86 +28,83 @@ import org.apache.beehive.netui.tags.AbstractSimpleTag; /** - * <p> + * <p/> * The DeclarePageInput tag is used to declare variables that are passed to the page from * the page flow. A page input variable has a lifetime of the page in which it * is declared and can be referenced using the <code>pageInput</code> data binding context. * The <code>name</code> attribute here is used as the identifier for the variable inside - * of this binding context, and the <code>type</code> attribute is used to identify + * of this binding context, and the <code>type</code> attribute is used to identify * the expected type of this variable. * </p> - * - * @jsptagref.tagdescription - * <p> + * + * @jsptagref.tagdescription <p> * Declares variables that are passed from - * the Controller file to the JSP page. - * - * <p> + * the Controller file to the JSP page. + * <p/> + * <p/> * The variable's lifetime is the same as that of the JSP page on which it - * is declared. - * - * <p> - * On the Controller file, use the <code>addPageInput</code> method + * is declared. + * <p/> + * <p/> + * On the Controller file, use the <code>addPageInput</code> method * (a method on the [EMAIL PROTECTED] org.apache.beehive.netui.pageflow.Forward Forward} class) * to make the variable available to the <netui-data:declarePageInput> tag. - * + * <p/> * <pre> * Forward f = new Forward("success"); * f.addPageInput("myData", new MyData()); * </pre> - * + * <p/> * Then, on the JSP page, declare the variable with the <netui-data:declarePageInput> tag. - * + * <p/> * <pre> <netui-data:declarePageInput name="<b>myData</b>" type="myPageFlow.MyPageFlowController.MyData"/></pre> - * - * <p> - * Once declared, the variable can be referenced using the + * <p/> + * <p/> + * Once declared, the variable can be referenced using the * <code><b>{pageInput...}</b></code> data binding context. * The <code>name</code> attribute is used as the identifier for the variable inside - * of this binding context, and the <code>type</code> attribute is used to identify + * of this binding context, and the <code>type</code> attribute is used to identify * the expected type of this variable. * </p> - * + * <p/> * <pre> <netui:label value="<b>{pageInput.myData}</b>"/></pre> - * + * <p/> * <p>Using the <netui-data:declarePageInput> has the following advantages - * + * <p/> * <blockquote> * <ul> * <li>The presence of <netui-data:declarePageInput> tags in a JSP file - * helps to indicate clearly the type of data expected at run time. This - * information about the incoming data helps your team understand any + * helps to indicate clearly the type of data expected at run time. This + * information about the incoming data helps your team understand any * data dependencies a given JSP page may have on the Controller file.</li> * </ul> * </blockquote> - * - * @example - * This sample shows how a variable, <code>foo</code>, is defined in the Controller file, + * @example This sample shows how a variable, <code>foo</code>, is defined in the Controller file, * and its value is - * passed to a JSP page by using the <code>addPageInput</code> method and the - * <netui-data:declarePageInput> tag. + * passed to a JSP page by using the <code>addPageInput</code> method and the + * <netui-data:declarePageInput> tag. * <h4>Code in the Controller file...</h4> - * + * <p/> * <pre> /** * * @jpf:action * * @jpf:forward name="simple" path="simple.jsp" - * */ + * */ * public Forward simple() * { * Forward f = new Forward("simple"); * f.addPageInput("fooBean", new FooBean()); * return f; * } - * + * <p/> * public static class FooBean * { * private String foo = "A Foo String"; - * + * <p/> * public String getFoo() * { * return foo; * } - * + * <p/> * public void setFoo(String foo) * { * this.foo = foo; @@ -117,18 +114,17 @@ * <pre> <netui-data:declarePageInput name="fooBean" type="pageInput.PageInputController.FooBean"/> * ... * fooBean.foo: <netui:label value="{pageInput.fooBean.foo}" /></pre> - * * @netui:tag name="declarePageInput" - * description="Use this tag to declare a page input variable that is available in the pageInput databinding context." - * body-content="scriptless" - * @netui.tldx:tag requiredchild="#nothing" - * renderer="workshop.netui.jspdesigner.tldx.DeclarePageInputRenderer" - * bodycontentpref="empty" - * expressioninfo="workshop.netui.jspdesigner.tldx.expression.NetuiPageInputExpressionInfo" + * description="Use this tag to declare a page input variable that is available in the pageInput databinding context." + * body-content="scriptless" + * @netui.tldx:tag requiredchild="#nothing" + * renderer="workshop.netui.jspdesigner.tldx.DeclarePageInputRenderer" + * bodycontentpref="empty" + * 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 = ""; @@ -142,13 +138,12 @@ * * @return a constant String representing the name of this tag. */ - public String getTagName() - { + public String getTagName() { return "DeclarePageInput"; } /** - * Set the name of a variable that can be referecned using the page + * Set the name of a variable that can be referecned using the page * input data binding context. * * @param name the name of the variable @@ -157,26 +152,24 @@ * @jsptagref.attributesyntaxvalue <i>string_name</i> * @netui:attribute required="true" */ - public void setName(String name) - { + public void setName(String name) { _name = name; } /** - * Set the required attribute. If a Page Input is required, the tag will report an + * Set the required attribute. If a Page Input is required, the tag will report an * error if the page input key does not appear in the set of page inputs * for a page. * * @param required whether to require the page input for the page * @netui:attribute required="false" */ - public void setRequired(boolean required) - { + public void setRequired(boolean required) { _required = required; } /** - * Set the type of the variable that referenced with the + * Set the type of the variable that referenced with the * [EMAIL PROTECTED] #setName} attribute on this tag. * * @param type the type of the variable that is referenced @@ -186,8 +179,7 @@ * @netui:attribute required="true" * @netui.tldx:attribute extype="java-classname" */ - public void setType(String type) - { + public void setType(String type) { _type = type; } @@ -195,21 +187,18 @@ * */ public void doTag() - throws JspException - { + throws JspException { if(logger.isDebugEnabled()) - logger.debug("Added a page input named \"" + _name + "\" of type \"" + _type + "\""); + logger.debug("Added a page input named \"" + _name + "\" of type \"" + _type + "\""); - if(_name.equals(EMPTY_STRING)) - { + if(_name.equals(EMPTY_STRING)) { String msg = Bundle.getErrorString("Tags_DeclarePageInput_EmptyName"); - registerTagError(msg,null); + registerTagError(msg, null); } - if(_type.equals(EMPTY_STRING)) - { + if(_type.equals(EMPTY_STRING)) { String msg = Bundle.getErrorString("Tags_DeclarePageInput_EmptyType"); - registerTagError(msg,null); + registerTagError(msg, null); } if(_required) { @@ -219,7 +208,7 @@ HttpServletRequest request = (HttpServletRequest)((PageContext)getJspContext()).getRequest(); Map actionOutputMap = InternalUtils.getPageInputMap(request); if(actionOutputMap == null || !actionOutputMap.containsKey(_name)) { - String msg = Bundle.getErrorString("Tags_DeclarePageInput_Required", new Object[] {_name}); + String msg = Bundle.getErrorString("Tags_DeclarePageInput_Required", new Object[]{_name}); registerTagError(msg, null); } } 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&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/Repeater.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/Repeater.java&r2=125643 ============================================================================== --- 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 Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.tags.databinding.repeater; // java imports + import org.apache.beehive.netui.script.common.DataAccessProviderStack; import org.apache.beehive.netui.script.common.IDataAccessProvider; import org.apache.beehive.netui.tags.DataSourceTag; @@ -47,9 +48,9 @@ * <tr><td>[EMAIL PROTECTED] org.apache.beehive.netui.tags.databinding.repeater.pad.Pad}</td><td>Used to convert irregular data sets into regular data sets through padding or truncating the output.</td></tr> * </table> * <p>The repeater can render in two modes; the first mode is a simple mode where the body of - * the repeater is rendered once for each item in the data set. In this case, none of the + * the repeater is rendered once for each item in the data set. In this case, none of the * other tags above are present in the repeater body. For example, the following will - * render an unordered HTML list of items that are list items which contain the lastName, firstName + * render an unordered HTML list of items that are list items which contain the lastName, firstName * of the current "customer" in the data set.</p> * <pre> * <ul> @@ -59,11 +60,11 @@ * </ul> * </pre> * <p>The second mode is a more structured mode - * of rendering where the tags above are used to delineate iteration boundaries on the body of + * of rendering where the tags above are used to delineate iteration boundaries on the body of * a <netui-data:repeater> tag. In this case, if one of the above tags is present, * any content directly in the body of the repeater is not rendered; rather, the content * inside the structured tags of the repeater is rendered.</p> - * <p>For example, the following will render the same output as the example + * <p>For example, the following will render the same output as the example * shown above, but it uses the structured tags for rendering the * <code>{pageFlow.customers}</code> expression:</p> * <pre> @@ -79,14 +80,12 @@ * </netui-data:repeaterFooter> * </netui-data:repeater> * </pre> - - * - * @jsptagref.tagdescription - * <p>Iterates over a data set to render it as HTML. + * + * @jsptagref.tagdescription <p>Iterates over a data set to render it as HTML. * The HTML is specified either directly within the the body of - * <netui-data:repeater> tag or within an associated set of "helper" tags. + * <netui-data:repeater> tag or within an associated set of "helper" tags. * The "helper" tags are listed below. - * + * <p/> * <blockquote> * <table border="1" cellspacing="0" cellpadding="5" width="90%"> * <tr><td><b>Tag</b></td><td><b>Description</b></td></tr> @@ -94,32 +93,32 @@ * <tr><td>[EMAIL PROTECTED] RepeaterItem}</td><td>Renders once for each iteration.</td></tr> * <tr><td>[EMAIL PROTECTED] RepeaterFooter}</td><td>Renders once at the end of the iteration.</td></tr> * <tr><td>[EMAIL PROTECTED] org.apache.beehive.netui.tags.databinding.repeater.pad.Pad}</td><td>Used to convert - * irregular data sets into regular data sets through padding - * or truncating the output.</td></tr> + * irregular data sets into regular data sets through padding + * or truncating the output.</td></tr> * </table> * </blockquote> - * + * <p/> * <p>The <netui-data:repeater> tag can render in two modes; the first mode is a simple mode where the body of - * the <netui-data:repeater> tag is rendered once for each item in the data set. In this case, none of the + * the <netui-data:repeater> tag is rendered once for each item in the data set. In this case, none of the * other tags above are present in the repeater body. For example, the following will * render the items in the "customers" data set as an unordered HTML list.</p> - * + * <p/> * <pre> <ul> * <netui-data:repeater dataSource="{pageFlow.customers}"> * <li><netui:label value="{container.item.lastName}, {container.item.firstName}"/></li> * </netui-data:repeater> * </ul></pre> - * + * <p/> * <p>The second mode is a more structured mode * of rendering where the "helper" tags - * are used to define the rendering of the data set. In this case, if one of the helper tags + * are used to define the rendering of the data set. In this case, if one of the helper tags * is present, * any HTML markup directly in the body of the <netui-data:repeater> tag is not rendered; rather, the HTML markup * inside the helper tags is rendered.</p> - * <p>For example, the following will render the same output as the example + * <p>For example, the following will render the same output as the example * shown above, but it uses the "helper" tags for rendering the * HTML markup:</p> - * + * <p/> * <pre> * <netui-data:repeater dataSource="{pageFlow.customers}"> * <netui-data:repeaterHeader> @@ -132,17 +131,15 @@ * </ul> * </netui-data:repeaterFooter> * </netui-data:repeater></pre> - * - * @example - * The following sample renders the data set as an HTML table. The table has two columns, "index" and "name", + * @example The following sample renders the data set as an HTML table. The table has two columns, "index" and "name", * and each iteration over the data set is rendered as a row of the table. - * + * <p/> * <pre> <netui-data:repeater dataSource="{pageFlow.myDataSet}"> * <netui-data:repeaterHeader> * <table border="1"> * <tr> * <td><b>index</b></td> - * <td><b>name</b></td> + * <td><b>name</b></td> * </tr> * </netui-data:repeaterHeader> * <netui-data:repeaterItem> @@ -157,19 +154,18 @@ * </netui-data:repeaterItem> * <netui-data:repeaterFooter> * </table> - * </netui-data:repeaterFooter> + * </netui-data:repeaterFooter> * </netui-data:repeater></pre> - * * @netui:tag name="repeater" description="A markup-generic tag that repeats over a data set, and renders the data onto the page." - * @netui.tldx:tag whitespace="indent" - * expressioninfo="workshop.netui.jspdesigner.tldx.expression.NetuiContainerExpressionInfo" - * renderer="workshop.netui.jspdesigner.tldx.RepeaterRenderer" + * @netui.tldx:tag whitespace="indent" + * expressioninfo="workshop.netui.jspdesigner.tldx.expression.NetuiContainerExpressionInfo" + * renderer="workshop.netui.jspdesigner.tldx.RepeaterRenderer" */ public class Repeater extends DataSourceTag - implements IDataAccessProvider, TryCatchFinally -{ - private static final Logger _logger = Logger.getInstance(Repeater.class); + implements IDataAccessProvider, TryCatchFinally { + + private static final Logger LOGGER = Logger.getInstance(Repeater.class); /** * A Repeater rendering state that signals the beginning of repeater rendering. @@ -184,7 +180,7 @@ /** * A Repeater rendering state that signals the rendering of the ITEM. - * The body renders in the ITEM state once for each item in the + * The body renders in the ITEM state once for each item in the * data set. */ public static final int ITEM = 2; @@ -199,7 +195,7 @@ * A Repeater rendering state that signals the end of repeater rendering. */ public static final int END = 4; - + private static final int HAVE_NOTHING = 0x000; private static final int HAVE_HEADER = 0x001; private static final int HAVE_ITEM = 0x010; @@ -222,41 +218,32 @@ * * @return a constant String representing the name of this tag. */ - public String getTagName() - { + public String getTagName() { return "Repeater"; } - + /** * Set a boolean that describes whether the repeater should ignore null * items encountered while iterating over a data set. - * - * @param ignoreNulls whether or not to ignore nulls * - * @jsptagref.attributedescription - * Boolean. If set to true, any null iteration items in the data set will be ignored. - * + * @param ignoreNulls whether or not to ignore nulls + * @jsptagref.attributedescription Boolean. If set to true, any null iteration items in the data set will be ignored. * @jsptagref.databindable false - * * @jsptagref.attributesyntaxvalue <i>boolean_ignoreNulls</i> - * * @netui:attribute required="false" */ - public void setIgnoreNulls(boolean ignoreNulls) - { + public void setIgnoreNulls(boolean ignoreNulls) { _ignoreNulls = ignoreNulls; } /** - * * @param padContext */ - public void setPadContext(PadContext padContext) - { + public void setPadContext(PadContext padContext) { if(_padContext == null) _padContext = padContext; - if(_logger.isDebugEnabled()) _logger.debug("Repeater has a padContext with text: " + _padContext); + if(LOGGER.isDebugEnabled()) LOGGER.debug("Repeater has a padContext with text: " + _padContext); return; } @@ -266,119 +253,103 @@ * references a null object and the defaultText attribute is non-null. * * @param defaultText the default text - * - * @jsptagref.attributedescription - * The text to render if the <code>dataSource</code> attribute references a null data set. - * + * @jsptagref.attributedescription The text to render if the <code>dataSource</code> attribute references a null data set. * @jsptagref.databindable false - * * @jsptagref.attributesyntaxvalue <i>string_defaultText</i> - * * @netui:attribute required="false" rtexprvalue="true" */ - public void setDefaultText(Object defaultText) - { + public void setDefaultText(Object defaultText) { _defaultText = defaultText; } /** - * Get the index of the current iteration through the body of this tag. This - * data can be accessed using the expression <code>container.index</code> - * on an attribute of a databindable NetUI tag that is contained within the - * repeating body of this tag. This expression is only valid when the dataset + * Get the index of the current iteration through the body of this tag. This + * data can be accessed using the expression <code>container.index</code> + * on an attribute of a databindable NetUI tag that is contained within the + * repeating body of this tag. This expression is only valid when the dataset * is being rendered. - * - * @see org.apache.beehive.netui.script.common.IDataAccessProvider + * * @return the integer index of the current data item in the data set + * @see org.apache.beehive.netui.script.common.IDataAccessProvider */ - public int getCurrentIndex() - { + public int getCurrentIndex() { return _currentIndex; } /** - * Get the item that is currently being rendered by this repeating tag. + * Get the item that is currently being rendered by this repeating tag. * This can be accessed using the expression <code>expression.item</code> - * on an attribute of a databindable NetUI tag that is contained within - * the repeating body of this tag. The expression is only valid when the dataset + * on an attribute of a databindable NetUI tag that is contained within + * the repeating body of this tag. The expression is only valid when the dataset * is being rendered. - * - * @see org.apache.beehive.netui.script.common.IDataAccessProvider + * * @return the current item in the data set + * @see org.apache.beehive.netui.script.common.IDataAccessProvider */ - public Object getCurrentItem() - { + public Object getCurrentItem() { return _currentItem; } /** - * Get the metadata for the current item. This method is not supported by + * Get the metadata for the current item. This method is not supported by * this tag. - * - * @see org.apache.beehive.netui.script.common.IDataAccessProvider + * * @throws UnsupportedOperationException this tag does not support this method from the IDataAccessProvider interface + * @see org.apache.beehive.netui.script.common.IDataAccessProvider */ - public Object getCurrentMetadata() - { - LocalizedUnsupportedOperationException uoe = + public Object getCurrentMetadata() { + LocalizedUnsupportedOperationException uoe = new LocalizedUnsupportedOperationException("The " + getTagName() + "does not export metadata for its iterated items."); - uoe.setLocalizedMessage(Bundle.getErrorString("Tags_DataAccessProvider_metadataUnsupported", new Object[] {getTagName()})); + uoe.setLocalizedMessage(Bundle.getErrorString("Tags_DataAccessProvider_metadataUnsupported", new Object[]{getTagName()})); throw uoe; } /** * Get the parent IDataAccessProvider for this tag. If this tag is contained within - * a IDataAccessProvider, the containing IDataAccessProvider is available through the + * a IDataAccessProvider, the containing IDataAccessProvider is available through the * expression <code>container.container</code>. Any valid properties of the - * parent IDataAccessProvider can be accessed through this expression. This method + * parent IDataAccessProvider can be accessed through this expression. This method * will return null if there is no parent IDataAccessProvider - * - * @see org.apache.beehive.netui.script.common.IDataAccessProvider + * * @return a containing IDataAccessProvider if one exists, null otherwise. + * @see org.apache.beehive.netui.script.common.IDataAccessProvider */ - public IDataAccessProvider getProviderParent() - { + public IDataAccessProvider getProviderParent() { return (IDataAccessProvider)findAncestorWithClass(this, IDataAccessProvider.class); } /** * Get the current render state for the repeater. This tag is used by child tags - * to access the current location in the repeater's rendering lifecycle. - * + * to access the current location in the repeater's rendering lifecycle. + * * @return an integer that represents the current state of the grid; this is one - * of [EMAIL PROTECTED] #INIT}, [EMAIL PROTECTED] #HEADER}, [EMAIL PROTECTED] #ITEM},[EMAIL PROTECTED] #FOOTER}, or [EMAIL PROTECTED] #END}. + * of [EMAIL PROTECTED] #INIT}, [EMAIL PROTECTED] #HEADER}, [EMAIL PROTECTED] #ITEM},[EMAIL PROTECTED] #FOOTER}, or [EMAIL PROTECTED] #END}. */ - public int getRenderState() - { + public int getRenderState() { return _renderState; } /** - * Add content to the content that is being buffered by this tag. All content + * Add content to the content that is being buffered by this tag. All content * written by the body of this tag is added to this buffer. The buffer is rendered - * at the end of the tag's lifecycle if no fatal errors have occurred during this + * at the end of the tag's lifecycle if no fatal errors have occurred during this * tag's lifecycle. * * @param content content that this tag should render. */ - public void addContent(String content) - { - if(_contentBuffer == null) - { - int size = (content != null ? (5*content.length()) : 1024); + public void addContent(String content) { + if(_contentBuffer == null) { + int size = (content != null ? (5 * content.length()) : 1024); _contentBuffer = new StringBuilder(size); } - + _contentBuffer.append(content); } /** - * - * * @param repeaterComponent [EMAIL PROTECTED] RepeaterComponent} to register with the Repeater parent */ - public void registerChildTag(RepeaterComponent repeaterComponent) - { + public void registerChildTag(RepeaterComponent repeaterComponent) { if(_renderState < HEADER && repeaterComponent instanceof RepeaterHeader) _have |= HAVE_HEADER; else if(repeaterComponent instanceof RepeaterFooter) @@ -388,47 +359,40 @@ } /** - * - * * @return SKIP_BODY if an error occurs; EVAL_BODY_BUFFERED otherwise * @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) source = evaluateDataSource(); // report any errors that may have occured - if (hasErrors()) + if(hasErrors()) return SKIP_BODY; _renderState = INIT; boolean empty = false; - if(source != null) - { + if(source != null) { _iterator = IteratorFactory.createIterator(source); - if (_iterator == null) - { + if(_iterator == null) { String msg = Bundle.getString("Tags_Repeater_nullIterator"); - if (_logger.isWarnEnabled()) _logger.warn(msg); + if(LOGGER.isWarnEnabled()) LOGGER.warn(msg); _iterator = IteratorFactory.EMPTY_ITERATOR; } // report any errors that may have occured - if (hasErrors()) + if(hasErrors()) return SKIP_BODY; - - if(_iterator != null && _iterator.hasNext()) - { + + if(_iterator != null && _iterator.hasNext()) { _currentIndex = 0; _currentItem = _iterator.next(); - if(_ignoreNulls && _currentItem == null) - { + if(_ignoreNulls && _currentItem == null) { // doStartTag doesn't know if the repeater is structured or unstructured // thus, if ignoreNulls is true, it's go to make an attempt to go // through the body with a non-null item. if there are no non-null @@ -448,39 +412,36 @@ empty = true; } // the dataSource evaluated to null - else empty = true; + else + empty = true; // TODO: optimize -- this doesn't need to happen when the data set is empty DataAccessProviderStack.addDataAccessProvider(this, pageContext); - if(empty) - { + if(empty) { // if the defaultText attribute is non-null, it will be evaluated as an expression // and rendered to the page - if(_defaultText != null) - { + if(_defaultText != null) { addContent(_defaultText.toString()); } // 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 return EVAL_BODY_BUFFERED; + } else + return EVAL_BODY_BUFFERED; } /** - * * @return SKIP_BODY if an error occurs or the data set has been rendered; EVAL_BODY_AGAIN otherwise */ - public int doAfterBody() - { + public int doAfterBody() { if(hasErrors()) return SKIP_BODY; boolean kids = (_have > 0 ? true : false); - - if(_logger.isDebugEnabled()) _logger.debug("structured repeater: " + kids + " render state: " + renderStateToString(_renderState)); + + if(LOGGER.isDebugEnabled()) LOGGER.debug("structured repeater: " + kids + " render state: " + renderStateToString(_renderState)); // structured rendering of the repeater; body content is ignored and real // content is rendered through cooperating nested tags @@ -488,43 +449,38 @@ return renderStructured(); // unstructured rendering of the repeater; this means that there isn't // a repeater(Header|Item|Footer) inside the body of the repeater. - else - { - if (bodyContent != null) - { + else { + if(bodyContent != null) { addContent(bodyContent.getString()); bodyContent.clearBody(); } - if (_iterator.hasNext()) - { + if(_iterator.hasNext()) { _currentIndex++; _currentItem = _iterator.next(); - if (_ignoreNulls && _currentItem == null) - { + if(_ignoreNulls && _currentItem == null) { advanceToNonNullItem(); // ignoring null items and no more non-null items, so skip to doEndTag() - if (_currentItem == null) return SKIP_BODY; + if(_currentItem == null) return SKIP_BODY; } // found another item; re-render the repeater's body return EVAL_BODY_AGAIN; } // no more items; skip to doEndTag() - else return SKIP_BODY; + else + return SKIP_BODY; } } /** - * * @return EVAL_PAGE * @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) @@ -535,22 +491,19 @@ return EVAL_PAGE; } - public void doFinally() - { + public void doFinally() { localRelease(); } public void doCatch(Throwable t) - throws Throwable - { + throws Throwable { throw t; } /** * Reset all of the fields of this tag. */ - protected void localRelease() - { + protected void localRelease() { super.localRelease(); // This is a work around in Tomcat where clearBody() throwns an internal exception @@ -558,9 +511,9 @@ // flushed. try { if(bodyContent != null) bodyContent.clearBody(); + } catch(Exception ignore) { } - catch (Exception ignore) {} - + _currentItem = null; _currentIndex = -1; _iterator = null; @@ -574,84 +527,76 @@ } /** - * Render a the repeater using the full repeater lifecycle. This + * Render a the repeater using the full repeater lifecycle. This * method is executed after each pass through the body if there - * are tags from the repeater tag set in the body of this repeater. + * are tags from the repeater tag set in the body of this repeater. * This method ensures that the repeater tag runs as a full state * machine for these tags. * * @return EVAL_BODY_AGAIN unless the lifecycle has completed; then return SKIP_BODY */ // TODO: optimize the number of trips through the body by ignoring the header / footer when necessary - private int renderStructured() - { - if(_logger.isDebugEnabled() && _padContext != null) - _logger.debug("\ncurrentIndex: " + _currentIndex + "\n" + - "checkMaxRepeat: " + _padContext.checkMaxRepeat(_currentIndex) + "\n" + - "checkMinRepeat: " + _padContext.checkMinRepeat(_currentIndex) + "\n"); - - if(_renderState == INIT) - { + private int renderStructured() { + if(LOGGER.isDebugEnabled() && _padContext != null) + LOGGER.debug("\ncurrentIndex: " + _currentIndex + "\n" + + "checkMaxRepeat: " + _padContext.checkMaxRepeat(_currentIndex) + "\n" + + "checkMinRepeat: " + _padContext.checkMinRepeat(_currentIndex) + "\n"); + + if(_renderState == INIT) { _renderState = HEADER; return EVAL_BODY_AGAIN; } - - if(_renderState == HEADER) - { + + if(_renderState == HEADER) { // This assert is invalid because adanceToNonNullItem is called in the // doStartTag() method and may move the _currentIndex beyond 0 //assert (_currentIndex == 0) : "Unexpected index value:" + _currentIndex; assert _renderedItems == 0; // this would only happen if Pad.maxRepeat == 0 - if(_padContext != null && _padContext.checkMaxRepeat(_renderedItems)) - { + if(_padContext != null && _padContext.checkMaxRepeat(_renderedItems)) { _renderState = FOOTER; return EVAL_BODY_AGAIN; } - if(_currentItem == null && _ignoreNulls) - { + if(_currentItem == null && _ignoreNulls) { advanceToNonNullItem(); // no non-null item was found; render the footer - if(_currentItem == null) - { + if(_currentItem == null) { doPadding(); // render the header _renderState = FOOTER; } // non-null item found; it's not the 0th item; render it - else _renderState = ITEM; + else + _renderState = ITEM; } // 0th item is non-null; render it - else _renderState = ITEM; + else + _renderState = ITEM; return EVAL_BODY_AGAIN; } - if(_renderState == ITEM) - { + if(_renderState == ITEM) { _renderedItems++; - if(_logger.isDebugEnabled() && _padContext != null) - _logger.debug("\ncurrentIndex: " + _currentIndex + "\n" + - "checkMaxRepeat: " + _padContext.checkMaxRepeat(_currentIndex) + "\n" + - "checkMinRepeat: " + _padContext.checkMinRepeat(_currentIndex) + "\n"); + if(LOGGER.isDebugEnabled() && _padContext != null) + LOGGER.debug("\ncurrentIndex: " + _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)))) - { + if(_iterator.hasNext() && (_padContext == null || (_padContext != null && !_padContext.checkMaxRepeat(_renderedItems)))) { _currentIndex++; _currentItem = _iterator.next(); - if(_ignoreNulls && _currentItem == null) - { + if(_ignoreNulls && _currentItem == null) { advanceToNonNullItem(); // last item - if(_currentItem == null) - { + if(_currentItem == null) { doPadding(); // render the header @@ -669,17 +614,15 @@ // So: // 1) pad if necessary // 2) render the footer - else - { + else { doPadding(); - + _renderState = FOOTER; - return EVAL_BODY_AGAIN; + return EVAL_BODY_AGAIN; } } - if(_renderState == FOOTER) - { + if(_renderState == FOOTER) { _renderState = END; return SKIP_BODY; } @@ -688,55 +631,50 @@ } /** - * <p> + * <p/> * Internal utility method. * </p> * </p> * This is called in places where the repeater needs to move to the next - * non-null item in the data set to render. This occurs when the + * non-null item in the data set to render. This occurs when the * current data item is null and the <code>ignoreNulls</code> * flag has been set to skip rendering null items in the data set. * </p> - * <p> + * <p/> * This method side-effects to advance the iterator to the next * non-null item or the end if there are zero remaining non-null * items. * </p> - * <p> + * <p/> * At the end, the <code>currentItem</code> may be null, and the - * <code>currentIndex</code> will reference either the integer + * <code>currentIndex</code> will reference either the integer * location in the data structure of the non-null data item, or * it will reference the end of the data structure. * </p> */ - private final void advanceToNonNullItem() - { + private final void advanceToNonNullItem() { assert _iterator != null; assert _currentItem == null; - while(_iterator.hasNext() && _currentItem == null) - { + while(_iterator.hasNext() && _currentItem == null) { _currentItem = _iterator.next(); _currentIndex++; } } /** - * When using the repeater's pad tag, it is possible to require a minimum number of + * When using the repeater's pad tag, it is possible to require a minimum number of * items render in the repeater. This method pads out the number of items until it - * reaches the [EMAIL PROTECTED] org.apache.beehive.netui.tags.databinding.repeater.pad.PadContext}'s + * reaches the [EMAIL PROTECTED] org.apache.beehive.netui.tags.databinding.repeater.pad.PadContext}'s * <code>minRepeat</code> property. */ - private final void doPadding() - { - if(_padContext != null && !_padContext.checkMinRepeat(_renderedItems)) - { + private final void doPadding() { + if(_padContext != null && !_padContext.checkMinRepeat(_renderedItems)) { // since padding is now running, un-set the current item so that the last // item isn't accessible during any later data binding _currentItem = null; - - for(int i = _renderedItems; !_padContext.checkMinRepeat(i); i++) - { + + for(int i = _renderedItems; !_padContext.checkMinRepeat(i); i++) { _currentIndex++; addContent(_padContext.getPadText()); } @@ -746,16 +684,20 @@ /** * An internal method that turns the current render state into a string for debugging. */ - private static final String renderStateToString(int state) - { - switch(state) - { - case INIT: return "INIT"; - case HEADER: return "HEADER"; - case ITEM: return "ITEM"; - case FOOTER: return "FOOTER"; - case END: return "END"; - default: return "INVALID STATE"; + private static final String renderStateToString(int state) { + switch(state) { + case INIT: + return "INIT"; + case HEADER: + return "HEADER"; + case ITEM: + return "ITEM"; + case FOOTER: + return "FOOTER"; + case END: + return "END"; + default: + return "INVALID STATE"; } } } 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&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterComponent.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterComponent.java&r2=125643 ============================================================================== --- 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 Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.tags.databinding.repeater; // java imports + import javax.servlet.jsp.JspException; // internal imports @@ -30,32 +31,31 @@ /** * The base class for tags that are part of the [EMAIL PROTECTED] Repeater} tag set * and participate in the structured nature of [EMAIL PROTECTED] Repeater} rendering. - * This class provides typed access to the [EMAIL PROTECTED] Repeater} tag and + * This class provides typed access to the [EMAIL PROTECTED] Repeater} tag and * enforces the basic JSP tag parenting requirements of tags that can * only be nested within the [EMAIL PROTECTED] Repeater} tag. + * * @see StructuredBaseTag */ public abstract class RepeaterComponent - extends StructuredBaseTag -{ + extends StructuredBaseTag { + private Repeater _repeater = null; /** * Default implementation of this JSP lifecycle method. - * + * * @return SKIP_BODY */ public int doAfterBody() - throws JspException - { + throws JspException { return SKIP_BODY; } /** * Reset all of the fields of this tag. */ - protected void localRelease() - { + protected void localRelease() { super.localRelease(); _repeater = null; } @@ -63,57 +63,52 @@ /** * Default implementation of [EMAIL PROTECTED] StructuredBaseTag#renderEndTag(int)}. * This returns EVAL_PAGE. - * + * * @param state the current render state of the Repeater * @return EVAL_PAGE * @throws JspException if an error occurs that can not be reported in the page */ protected int renderEndTag(int state) - throws JspException - { + throws JspException { return EVAL_PAGE; } /** * Get the [EMAIL PROTECTED] Repeater} parent of this tag. - * + * * @return the [EMAIL PROTECTED] Repeater} parent of this tag */ - protected final Repeater getRepeater() - { + protected final Repeater getRepeater() { return _repeater; } /** * Prepare data that is provided to subclasses of this tag. */ - protected void prepare() - { + protected void prepare() { _repeater = (Repeater)getParent(); _repeater.registerChildTag(this); } /** - * Default implementation of [EMAIL PROTECTED] StructuredBaseTag#getValidContainerType} that + * Default implementation of [EMAIL PROTECTED] StructuredBaseTag#getValidContainerType} that * enforces that the parent of this tag is the [EMAIL PROTECTED] Repeater} tag. Subclasses * may override this method to further specialize the required container type. - * + * * @return the valid container type of a RepeaterComponent; the Repeater.class */ - protected Class getValidContainerType() - { + protected Class getValidContainerType() { return Repeater.class; } /** * Get the render state of the nearest structured tag. For subclasses of this * tag, the nearest structured tag is the [EMAIL PROTECTED] Repeater} tag. - * + * * @return the current render state of the Repeater */ - protected int getCurrentRenderState() - { + protected int getCurrentRenderState() { return _repeater.getRenderState(); } } 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&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterFooter.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterFooter.java&r2=125643 ============================================================================== --- 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 Wed Jan 19 11:00:31 2005 @@ -24,41 +24,38 @@ // external imports /** - * This tag is used to render the footer of a [EMAIL PROTECTED] Repeater}. This - * header may contain any markup or tags that can be rendered to a page. In + * This tag is used to render the footer of a [EMAIL PROTECTED] Repeater}. This + * header may contain any markup or tags that can be rendered to a page. In * the case of closing a table, ordered list, or unordered list, the elements * <table>, <ol>, and <ul> could respectively be rendered inside - * the body of this tag. Ther is no data item present at the time that the - * RepeaterFooter renders, so tags in the body can not reference the - * <code>container</code> databinding context to access a current item - * or index, though other databinding contexts are available. + * the body of this tag. Ther is no data item present at the time that the + * RepeaterFooter renders, so tags in the body can not reference the + * <code>container</code> databinding context to access a current item + * or index, though other databinding contexts are available. * <p>The RepeaterFooter renders exactly once in a table during the [EMAIL PROTECTED] Repeater} * tag's [EMAIL PROTECTED] Repeater#FOOTER} rendering state.</p> * - * @jsptagref.tagdescription - * Renders the footer of a [EMAIL PROTECTED] Repeater} tag. This - * header may contain any HTML markup that can be rendered to a page. In + * @jsptagref.tagdescription Renders the footer of a [EMAIL PROTECTED] Repeater} tag. This + * header may contain any HTML markup that can be rendered to a page. In * the case of closing a table, ordered list, or unordered list, the elements * </table>, </ol>, and </ul> could respectively be rendered inside - * the body of the <netui-data:repeaterFooter> tag. - * - * <p>There is no data item present at the time that the - * <netui-data:repeaterFooter> renders (because the iteration of - * the <netui-data:repeater> tag has ended), so tags in the body can not reference the + * the body of the <netui-data:repeaterFooter> tag. + * <p/> + * <p>There is no data item present at the time that the + * <netui-data:repeaterFooter> renders (because the iteration of + * the <netui-data:repeater> tag has ended), so tags in the body can not reference the * <code>{container...}</code> data binding context to access the current item in * the data set, though other databinding contexts are available. - * - * @example - * The following sample renders the data set as an HTML table. The table has two columns, "index" and "name", + * @example The following sample renders the data set as an HTML table. The table has two columns, "index" and "name", * and each iteration over the data set is rendered a row of the table. The <netui-data:repeaterFooter> * tag renders once, after the iteration is complete. It renders a closing HTML table tag. - * + * <p/> * <pre> <netui-data:repeater dataSource="{pageFlow.myDataSet}"> * <netui-data:repeaterHeader> * <table border="1"> * <tr> * <td><b>index</b></td> - * <td><b>name</b></td> + * <td><b>name</b></td> * </tr> * </netui-data:repeaterHeader> * <netui-data:repeaterItem> @@ -73,23 +70,21 @@ * </netui-data:repeaterItem> * <b><netui-data:repeaterFooter></b> * </table> - * <b></netui-data:repeaterFooter></b> + * <b></netui-data:repeaterFooter></b> * </netui-data:repeater></pre> - * * @netui:tag name="repeaterFooter" description="Use this tag to render the footer of a Repeater." - * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.RepeaterFooterRenderer" whitespace="indent" requiredparent="repeater" + * @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 * for reporting tag errors. * * @return a constant String representing the name of this tag. */ - public String getTagName() - { + public String getTagName() { return "RepeaterFooter"; } @@ -99,11 +94,11 @@ * * @return SKIP_BODY unless the repeater render state is [EMAIL PROTECTED] Repeater#FOOTER}, then EVAL_BODY_BUFFERED */ - public int renderStartTag(int state) - { + public int renderStartTag(int state) { if(state == Repeater.FOOTER) return EVAL_BODY_BUFFERED; - else return SKIP_BODY; + else + return SKIP_BODY; } /** @@ -111,14 +106,12 @@ * * @return SKIP_BODY */ - public int doAfterBody() - { + public int doAfterBody() { getRepeater().addContent(bodyContent.getString()); return SKIP_BODY; } - protected void localRelease() - { + protected void localRelease() { super.localRelease(); // This is a work around in Tomcat where clearBody() throwns an internal exception @@ -126,7 +119,7 @@ // flushed. try { if(bodyContent != null) bodyContent.clearBody(); + } catch(Exception ignore) { } - catch (Exception ignore) {} } } 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&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterHeader.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterHeader.java&r2=125643 ============================================================================== --- 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 Wed Jan 19 11:00:31 2005 @@ -25,40 +25,37 @@ /** * This tag is used to render the header of a [EMAIL PROTECTED] Repeater}. This header may contain - * any markup or tags that can be rendered to a page. In the case of starting a + * any markup or tags that can be rendered to a page. In the case of starting a * table, ordered list, or unordered list, the HTML elements <table>, <ol>, * and <ul> could respectively be rendered inside the body of this tag. - * There is no data item present at the time that the RepeaterHeader renders, so tags in the + * There is no data item present at the time that the RepeaterHeader renders, so tags in the * body can not reference the <code>container</code> databinding context to access * a current item or index, though other databinding contexts are available. * <p>The RepeaterHeader renders exactly once in a table during the [EMAIL PROTECTED] Repeater} * tag's [EMAIL PROTECTED] Repeater#HEADER} rendering state.</p> * - * @jsptagref.tagdescription - * Renders the header of a [EMAIL PROTECTED] Repeater} tag. + * @jsptagref.tagdescription Renders the header of a [EMAIL PROTECTED] Repeater} tag. * This header may contain - * any any HTML markup that can be rendered to a page. In the case of starting a + * any any HTML markup that can be rendered to a page. In the case of starting a * table, ordered list, or unordered list, the HTML elements <table>, <ol>, * and <ul> could respectively be rendered inside the body of this tag. - * + * <p/> * <p>There is no data item present at the time that the <netui-data:repeaterHeader> renders - * (because the iteration of - * the <netui-data:repeater> tag has not yet begun), so tags in the + * (because the iteration of + * the <netui-data:repeater> tag has not yet begun), so tags in the * body can not reference the <code>{container...}</code> data binding context to access * the current item in the data set, though other databinding contexts are available. - * - * @example - * The following sample renders the data set as an HTML table. The table has two columns, "index" and "name", + * @example The following sample renders the data set as an HTML table. The table has two columns, "index" and "name", * and each iteration over the data set is rendered a row of the table. The <netui-data:repeaterHeader> * tag renders once, before the iteration has begun. It renders an opening HTML table tag and * two header rows for the table. - * + * <p/> * <pre> <netui-data:repeater dataSource="{pageFlow.myDataSet}"> * <b><netui-data:repeaterHeader></b> * <table border="1"> * <tr> * <td><b>index</b></td> - * <td><b>name</b></td> + * <td><b>name</b></td> * </tr> * <b></netui-data:repeaterHeader></b> * <netui-data:repeaterItem> @@ -73,15 +70,13 @@ * </netui-data:repeaterItem> * <netui-data:repeaterFooter> * </table> - * </netui-data:repeaterFooter> + * </netui-data:repeaterFooter> * </netui-data:repeater></pre> - * * @netui:tag name="repeaterHeader" description="Use this tag to render the header of a Repeater." * @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 @@ -89,8 +84,7 @@ * * @return a constant String representing the name of this tag. */ - public String getTagName() - { + public String getTagName() { return "RepeaterHeader"; } @@ -100,11 +94,11 @@ * * @return SKIP_BODY unless the repeater render state is [EMAIL PROTECTED] Repeater#HEADER}, then EVAL_BODY_BUFFERED */ - public int renderStartTag(int state) - { + public int renderStartTag(int state) { if(state == Repeater.HEADER) return EVAL_BODY_BUFFERED; - else return SKIP_BODY; + else + return SKIP_BODY; } /** @@ -112,15 +106,13 @@ * * @return SKIP_BODY */ - public int doAfterBody() - { + public int doAfterBody() { getRepeater().addContent(bodyContent.getString()); - + return SKIP_BODY; } - protected void localRelease() - { + protected void localRelease() { super.localRelease(); // This is a work around in Tomcat where clearBody() throwns an internal exception @@ -128,8 +120,8 @@ // flushed. try { if(bodyContent != null) bodyContent.clearBody(); + } catch(Exception ignore) { } - catch (Exception ignore) {} } } 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&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterItem.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterItem.java&r2=125643 ============================================================================== --- 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 Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.tags.databinding.repeater; // java imports + import javax.servlet.jsp.JspException; // internal imports @@ -27,42 +28,39 @@ /** - * This tag is used to render each item in the data set. The items in the data set are + * This tag is used to render each item in the data set. The items in the data set are * provided by this tag's Repeater parent and are available for databinding using the * <code>container</code> databinding context. The current item is referenced * using the <code>container.item</code> expression. - * <p>The RepeaterItem tag can only be uesd when directly contained by a Repeater tag, and + * <p>The RepeaterItem tag can only be uesd when directly contained by a Repeater tag, and * a RepeaterItem is rendered during the Repeater's [EMAIL PROTECTED] Repeater#ITEM} rendering state.</p> - * <p>By default, the RepeaterItem simply renders its body once for each of the items in the + * <p>By default, the RepeaterItem simply renders its body once for each of the items in the * Repeater tag's data set.</p> * - * @jsptagref.tagdescription - * This tag is used to render an individual item in the data set as it is iterated over by - * the [EMAIL PROTECTED] Repeater} tag. + * @jsptagref.tagdescription This tag is used to render an individual item in the data set as it is iterated over by + * the [EMAIL PROTECTED] Repeater} tag. * As an individual item is being iterated over, it is available using the * <code>{container.item}</code> databinding expression. - * <p>The <netui-data:repeaterItem> tag can only be uesd when directly contained by + * <p>The <netui-data:repeaterItem> tag can only be uesd when directly contained by * a <netui-data:repeater> tag.</p> - * <p>By default, the <netui-data:repeaterItem> simply renders its body once for each of the items in the - * <netui-data:repeater> tag's data set.</p> - * <p>A <netui-data:repeaterItem> has the ability to render different HTML - * markup for each of the items that - * it renders. This is possible using the - * [EMAIL PROTECTED] com.bea.wlw.netui.tags.databinding.repeater.choice.ChoiceMethod} + * <p>By default, the <netui-data:repeaterItem> simply renders its body once for each of the items in the + * <netui-data:repeater> tag's data set.</p> + * <p>A <netui-data:repeaterItem> has the ability to render different HTML + * markup for each of the items that + * it renders. This is possible using the + * [EMAIL PROTECTED] com.bea.wlw.netui.tags.databinding.repeater.choice.ChoiceMethod} * and [EMAIL PROTECTED] com.bea.wlw.netui.tags.databinding.repeater.choice.Choice} tags. - * The <netui-data:choiceMethod> tag decides which <netui-data:choice> + * The <netui-data:choiceMethod> tag decides which <netui-data:choice> * tag to render.</p> - * - * @example - * The following sample renders the data set as an HTML table. The <netui-data:repeaterItem> tag + * @example The following sample renders the data set as an HTML table. The <netui-data:repeaterItem> tag * renders a new row in the table for each item in the data set. - * + * <p/> * <pre> <netui-data:repeater dataSource="{pageFlow.myDataSet}"> * <netui-data:repeaterHeader> * <table border="1"> * <tr> * <td><b>index</b></td> - * <td><b>name</b></td> + * <td><b>name</b></td> * </tr> * </netui-data:repeaterHeader> * <b><netui-data:repeaterItem></b> @@ -77,16 +75,15 @@ * <b></netui-data:repeaterItem></b> * <netui-data:repeaterFooter> * </table> - * </netui-data:repeaterFooter> + * </netui-data:repeaterFooter> * </netui-data:repeater></pre> - * * @netui:tag name="repeaterItem" description="Use this tag to render each item in the data set." * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.RepeaterItemRenderer" whitespace="indent" requiredparent="repeater" */ public class RepeaterItem - extends RepeaterComponent -{ - private static final Logger _logger = Logger.getInstance(RepeaterItem.class); + extends RepeaterComponent { + + private static final Logger LOGGER = Logger.getInstance(RepeaterItem.class); /** * Get the name of this tag. This is used to identify the type of this tag @@ -94,8 +91,7 @@ * * @return a constant String representing the name of this tag. */ - public String getTagName() - { + public String getTagName() { return "RepeaterItem"; } @@ -105,19 +101,18 @@ * * @return SKIP_BODY unless the repeater render state is [EMAIL PROTECTED] Repeater#ITEM}, then EVAL_BODY_BUFFERED */ - public int renderStartTag(int state) - { + public int renderStartTag(int state) { if(state == Repeater.ITEM) return EVAL_BODY_BUFFERED; - else return SKIP_BODY; + else + return SKIP_BODY; } /** * @return SKIP_BODY if the item has completed rendering; EVAL_BODY_BUFFERED if the body should render again. */ public int doAfterBody() - throws JspException - { + throws JspException { if(bodyContent != null) getRepeater().addContent(bodyContent.getString()); @@ -127,8 +122,7 @@ /** * Reset all of the fields of this tag. */ - protected void localRelease() - { + protected void localRelease() { super.localRelease(); // This is a work around in Tomcat where clearBody() throwns an internal exception @@ -136,7 +130,7 @@ // flushed. try { if(bodyContent != null) bodyContent.clearBody(); + } catch(Exception ignore) { } - catch (Exception ignore) {} - } + } } 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&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/Pad.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/Pad.java&r2=125643 ============================================================================== --- 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 Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.tags.databinding.repeater.pad; // java imports + import javax.servlet.jsp.JspException; // internal imports @@ -29,25 +30,23 @@ // external imports /** - * <p> + * <p/> * A tag that affects the number of items that are rendered in a * [EMAIL PROTECTED] org.apache.beehive.netui.tags.databinding.repeater.Repeater}. * The Pad tag has the ability to turn an irregular data set in the * [EMAIL PROTECTED] org.apache.beehive.netui.tags.databinding.repeater.Repeater} - * into a regular dataset through the use of the three attributes on the Pad tag. The Pad tag can - * truncate the rendering of a data set if enough items have been rendered or can + * into a regular dataset through the use of the three attributes on the Pad tag. The Pad tag can + * truncate the rendering of a data set if enough items have been rendered or can * pad a default item text onto the end of a data set that is not big enough. If the padText attribute * is unset, the body of the Pad tag is used as the padText. * </p> - * <p> + * <p/> * Note, the <code>container</code> data binding context should not be used inside - * of the Pad's <code>padText</code> attribute as binding to both the <code>item</code> + * of the Pad's <code>padText</code> attribute as binding to both the <code>item</code> * and <code>index</code> could product unexpected results. * </p> - - * - * @jsptagref.tagdescription - * <p> + * + * @jsptagref.tagdescription <p> * Sets the number of items rendered by a * [EMAIL PROTECTED] com.bea.wlw.netui.tags.databinding.repeater.Repeater} tag. * The <netui-data:pad> tag has the ability to turn an irregular data set in the @@ -56,34 +55,31 @@ * <blockquote> * <ul> * <li><code>maxRepeat</code> - truncates the rendering of the data set</li> - * <li><code>minRepeat</code> - forces the <netui-data:repeater> to render + * <li><code>minRepeat</code> - forces the <netui-data:repeater> to render * a minimum number of elements</li> * <li><code>padText - default text to render if the data set does not have the * minimum number of elements</code></li> * </ul> - * </blockquote> - * + * </blockquote> + * <p/> * <p>If the <code>padText</code> attribute * is unset, the body of the <netui-data:pad> tag is used as the default text. - * - * @example - * In the following example, assume that the <netui-data:repeater> tag iterates over - * a [EMAIL PROTECTED] java.util.List java.util.List} object. The <netui-data:pad> limits the iteration - * to three cycles, no matter how many elements are actually in the List. + * @example In the following example, assume that the <netui-data:repeater> tag iterates over + * a [EMAIL PROTECTED] java.util.List java.util.List} object. The <netui-data:pad> limits the iteration + * to three cycles, no matter how many elements are actually in the List. * <pre> <netui-data:repeater dataSource="{pageFlow.myList}"> * <netui-data:pad maxRepeat="3"/> * <netui-data:repeaterItem> * <netui:label value="{container.item}" /> * </netui-data:repeaterItem> * </netui-data:repeater></pre> - * * @netui:tag name="pad" description="Affects the number of items that are rendered in a Repeater." * @netui.tldx:tag requiredparent="repeater" output="|$children|" whitespace="indent" */ public class Pad - extends RepeaterComponent -{ - private static final Logger _logger = Logger.getInstance(Pad.class); + extends RepeaterComponent { + + private static final Logger LOGGER = Logger.getInstance(Pad.class); private static final String EMPTY_STRING = ""; @@ -97,28 +93,21 @@ * * @return a constant String representing the name of this tag. */ - public String getTagName() - { + public String getTagName() { return "Pad"; } /** - * Set the text that will be used when padding a Repeater that + * Set the text that will be used when padding a Repeater that * renders its body too few times. - * - * @param padText the text that is used to pad a repeater's content * - * @jsptagref.attributedescription - * The text will be used when padding a <netui-data:repeater> that renders too few times - * + * @param padText the text that is used to pad a repeater's content + * @jsptagref.attributedescription The text will be used when padding a <netui-data:repeater> that renders too few times * @jsptagref.databindable true - * * @jsptagref.attributesyntaxvalue <i>string_padText</i> - * * @netui:attribute required="false" rtexprvalue="true" */ - public void setPadText(String padText) - { + public void setPadText(String padText) { _padText = padText; } @@ -127,24 +116,18 @@ * If the size of the data set is greater than this, only this many * items will be rendered. This value can be a String of an integer * or can be an expression that references an integer. - * - * @param maxRepeat an integer or an expression that references an integer - * for the maximum number of items to render * - * @jsptagref.attributedescription - * Set the maximum number of items that will be rendered by a <netui-data:repeater> tag. + * @param maxRepeat an integer or an expression that references an integer + * for the maximum number of items to render + * @jsptagref.attributedescription Set the maximum number of items that will be rendered by a <netui-data:repeater> tag. * If the size of the data set is greater than this, only this many * items will be rendered. This value can be an integer * or can be an expression that resolves to an integer. - * * @jsptagref.databindable true - * * @jsptagref.attributesyntaxvalue <i>integer_or_expression_maxRepeat</i> - * * @netui:attribute required="false" rtexprvalue="true" */ - public void setMaxRepeat(int maxRepeat) - { + public void setMaxRepeat(int maxRepeat) { _maxRepeat = new Integer(maxRepeat); } @@ -154,78 +137,66 @@ * be padded with value of the pad text attribute. * * @param minRepeat an integer or an expression that references - * an integer for the minimum number of items to render - * - * @jsptagref.attributedescription - * Set the minimum number of items that will be rendered by a <netui-data:repeater> tag. + * an integer for the minimum number of items to render + * @jsptagref.attributedescription Set the minimum number of items that will be rendered by a <netui-data:repeater> tag. * If the size of the data set is smaller than this, the data set will * be padded with the value of the <code>padText</code> attribute. This value can be an integer * or can be an expression that resolves to an integer. - * * @jsptagref.databindable true - * * @jsptagref.attributesyntaxvalue <i>integer_or_expression_minRepeat</i> - * * @netui:attribute required="false" rtexprvalue="true" */ - public void setMinRepeat(int minRepeat) - { + public void setMinRepeat(int minRepeat) { _minRepeat = new Integer(minRepeat); } /** - * Render the body of this tag and buffer the output. If + * Render the body of this tag and buffer the output. If * the padText attribute is unset, the body content is used instead. */ public int renderStartTag(int state) - throws JspException - { + throws JspException { if(_padText == null) return EVAL_BODY_BUFFERED; - else return SKIP_BODY; + else + return SKIP_BODY; } /** - * Complete rendering the body of this tag. If the padText property was unset, + * Complete rendering the body of this tag. If the padText property was unset, * the body of the tag is used as the pad text. * * @param state the current render state of the Repeater * @return EVAL_PAGE * @throws JspException if an error occurs that can not be reported on the page */ - public int renderEndTag(int state) - throws JspException - { - if(_padText == null) - { + public int renderEndTag(int state) + throws JspException { + if(_padText == null) { _padText = bodyContent.getString(); - } - else - { + } else { _padText = _padText != null ? _padText : EMPTY_STRING; } - if(hasErrors()) - { + if(hasErrors()) { reportErrors(); localRelease(); return EVAL_PAGE; } 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); - + return EVAL_PAGE; } /** * Reset all of the fields of this tag. */ - protected void localRelease() - { + protected void localRelease() { super.localRelease(); if(bodyContent != null) bodyContent.clearBody(); _padText = null; @@ -244,34 +215,29 @@ * @throws JspException if an error occurs that can not be reported on the page */ protected void verifyAttributes() - throws JspException - { - if(_maxRepeat != null && _maxRepeat.intValue() <= 0) - { - String msg = Bundle.getErrorString("Tags_Pad_intTooSmall", new Object[] {_maxRepeat, "maxRepeat"}); + throws JspException { + if(_maxRepeat != null && _maxRepeat.intValue() <= 0) { + String msg = Bundle.getErrorString("Tags_Pad_intTooSmall", new Object[]{_maxRepeat, "maxRepeat"}); getRepeater().registerTagError(msg, null); } - if(_minRepeat != null && _minRepeat.intValue() <= 0) - { - String msg = Bundle.getErrorString("Tags_Pad_minRepeatIntTooSmall", new Object[] {_minRepeat, "minRepeat"}); + if(_minRepeat != null && _minRepeat.intValue() <= 0) { + String msg = Bundle.getErrorString("Tags_Pad_minRepeatIntTooSmall", new Object[]{_minRepeat, "minRepeat"}); getRepeater().registerTagError(msg, null); } // check composite properties if(_maxRepeat != null && - _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 != 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."; - _logger.warn(msg); + LOGGER.warn(msg); } - String msg = Bundle.getErrorString("Tags_Pad_minGreaterThanMax", new Object[] {_maxRepeat, _minRepeat}); - getRepeater().registerTagError(msg,null); + String msg = Bundle.getErrorString("Tags_Pad_minGreaterThanMax", new Object[]{_maxRepeat, _minRepeat}); + getRepeater().registerTagError(msg, null); } } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/PadContext.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/PadContext.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/PadContext.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/PadContext.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/PadContext.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/PadContext.java Wed Jan 19 11:00:31 2005 @@ -25,12 +25,12 @@ /** * A JavaBean that encapsulates the data needed to pad a Repeater with - * text. The PadContext is needed if the given consttraints, the + * text. The PadContext is needed if the given consttraints, the * minRepeat and maxRepeat attributes, require that the data rendered * in the repeater be padded. */ -public class PadContext -{ +public class PadContext { + private static final String EMPTY_STRING = ""; /** @@ -43,14 +43,11 @@ private String _padText = EMPTY_STRING; /** - * - * - * @param padText the text that will be used to pad the Repeater content, if necessary + * @param padText the text that will be used to pad the Repeater content, if necessary * @param minRepeat the minimum number of items that must be rendered in the repeater's body * @param maxRepeat the maximum number of items to render in the repeater's body */ - public PadContext(String padText, int minRepeat, int maxRepeat) - { + public PadContext(String padText, int minRepeat, int maxRepeat) { _padText = (padText != null ? padText : EMPTY_STRING); _minRepeat = minRepeat; _maxRepeat = maxRepeat; @@ -61,8 +58,7 @@ * * @return the pad text */ - public String getPadText() - { + public String getPadText() { return _padText; } @@ -71,8 +67,7 @@ * * @return the minimum number of items that must be rendered in the repeater's body */ - public int getMinRepeat() - { + public int getMinRepeat() { return _minRepeat; } @@ -81,46 +76,42 @@ * * @return the maximum number of items to render items in the repeater's body */ - public int getMaxRepeat() - { + public int getMaxRepeat() { return _maxRepeat; } /** - * * @param currCount the count of the number of items rendered. * @return <code>true</code> if the minimum number of items have been rendered; <code>false</code> otherwise */ - public boolean checkMinRepeat(int currCount) - { + public boolean checkMinRepeat(int currCount) { if(_minRepeat == DEFAULT_VALUE) return true; else if(currCount >= _minRepeat) return true; - else return false; + else + return false; } /** - * * @param currCount the count of the number of items rendered so far * @return <code>true</code> if the maximum number of items have been rendered; <code>false</code> otherwise */ - public boolean checkMaxRepeat(int currCount) - { + public boolean checkMaxRepeat(int currCount) { if(_maxRepeat == DEFAULT_VALUE) return false; else if(currCount < _maxRepeat) return false; - else return true; + else + return true; } /** * Get a debugging String that represents a PadContext. - * + * * @return a String representation of the PadContext */ - public String toString() - { + public String toString() { StringBuilder buf = new StringBuilder(32); buf.append("\nPadContext: "); buf.append("padText: " + _padText + "\n"); 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&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/script/GetData.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/script/GetData.java&r2=125643 ============================================================================== --- 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 Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.tags.databinding.script; // java imports + import javax.servlet.jsp.JspException; // internal imports @@ -29,48 +30,44 @@ // external imports /** - * <p> + * <p/> * This tag evaluates an expression and places the result of expression evaluation - * in a JSP's <code>PageContext</code>. This can be used to extract objects from forms, - * page flows, and other objects that can be databound; once in the JSP, - * scriptlet can be written using these objects by accessing them through the + * in a JSP's <code>PageContext</code>. This can be used to extract objects from forms, + * page flows, and other objects that can be databound; once in the JSP, + * scriptlet can be written using these objects by accessing them through the * [EMAIL PROTECTED] javax.servlet.jsp.PageContext#getAttribute} method. * </p> - * - * @jsptagref.tagdescription - * Evaluates an expression and places the result in the - * [EMAIL PROTECTED] javax.servlet.jsp.PageContext javax.servlet.jsp.PageContext} object, + * @jsptagref.tagdescription Evaluates an expression and places the result in the + * [EMAIL PROTECTED] javax.servlet.jsp.PageContext javax.servlet.jsp.PageContext} object, * where the data is available to JSP scriptlets. This tag can be used to extract data from * forms, Controller files, and any data binding context and make it available to scriptlets. - * - * <p>The following <netui-data:getData> tag extracts data from the Controller file and + * <p/> + * <p>The following <netui-data:getData> tag extracts data from the Controller file and * places it * in the <code>myData</code> field of the PageContext object: - * + * <p/> * <pre> <netui-data:getData resultId="myData" value="{pageFlow.myData}"/></pre> - * - * <p>The following scriptlet extracts the data from the <code>PageContext</code> + * <p/> + * <p>The following scriptlet extracts the data from the <code>PageContext</code> * object and writes it to the rendered HTML: - * + * <p/> * <pre> <%= pageContext.getAttribute("myData") %></pre> - * - * @example - * In this first sample, the <netui-data:getData> tag loads data into the - * <code>PageContext</code> object. You can subsequently access the data - * through the PageContext's <code>getAttribute(String)</code> method. + * @example In this first sample, the <netui-data:getData> tag loads data into the + * <code>PageContext</code> object. You can subsequently access the data + * through the PageContext's <code>getAttribute(String)</code> method. * <pre> <netui:form action="lastNameAction" focus="lastname"> * ... * <netui-data:getData resultId="first" value="{actionForm.firstname}"/> * ... - * <% + * <% * String firstName = (String) pageContext.getAttribute("first"); * System.out.println("First Name = " + firstName); * ... * %> * ... * </netui:form></pre> - * + * <p/> * <p>This next sample shows how to use <netui-data:getData> and the <code>PageContext</code> * inside of other containers, in this case a <netui-data:repeater> tag. The <netui-data:getData> below * extracts each element as the <netui-data:repeater> iterates over the data set and writes it to the Java console:</p> @@ -79,7 +76,7 @@ * <netui-data:repeaterItem> * <netui:label value="{container.item}" /> * <netui-data:getData resultId="item" value="{container.item}"/> - * <% + * <% * String currentItem = (String) pageContext.getAttribute("item"); * System.out.println(currentItem); * ... @@ -87,16 +84,15 @@ * </netui-data:repeaterItem> * ... * </netui-data:repeater></pre> - * * @netui:tag name="getData" description="Evaluates an expression and places the result in the JSP's PageContext. Can be used to extract objects from forms, page flows, and other objects that can be databound. You can then write a scriplet to access the data by using the getAttribute method of javax.servlet.jsp.PageContext." - * @netui.tldx:tag requiredchild="#nothing" - * renderer="workshop.netui.jspdesigner.tldx.GetDataRenderer" - * bodycontentpref="empty" + * @netui.tldx:tag requiredchild="#nothing" + * renderer="workshop.netui.jspdesigner.tldx.GetDataRenderer" + * bodycontentpref="empty" */ public class GetData - extends AbstractClassicTag -{ - private static final Logger _logger = Logger.getInstance(GetData.class); + extends AbstractClassicTag { + + private static final Logger LOGGER = Logger.getInstance(GetData.class); private Object _value = null; private String _resultId = null; @@ -107,8 +103,7 @@ * * @return a constant String representing the name of this tag. */ - public String getTagName() - { + public String getTagName() { return "GetData"; } @@ -116,19 +111,13 @@ * Set the expression to evaluate. * * @param value the expression to evaluate - * - * @jsptagref.attributedescription - * The data binding expression to evaluate. The result will be stored in + * @jsptagref.attributedescription The data binding expression to evaluate. The result will be stored in * the PageContext object as specified in the <code>resultId</code> attribute. - * * @jsptagref.databindable true - * * @jsptagref.attributesyntaxvalue <i>expression_value</i> - * * @netui:attribute required="true" rtexprvalue="true" */ - public void setValue(Object value) - { + public void setValue(Object value) { _value = value; } @@ -137,28 +126,21 @@ * will be stored in the PageContext. * * @param resultId the String key - * - * @jsptagref.attributedescription - * Specifies the property of the PageContext object where the data will be stored. - * + * @jsptagref.attributedescription Specifies the property of the PageContext object where the data will be stored. * @jsptagref.databindable false - * * @jsptagref.attributesyntaxvalue <i>string_resultId</i> - * * @netui:attribute required="true" */ - public void setResultId(String resultId) - { + public void setResultId(String resultId) { _resultId = resultId; } /** * Start the tag evaluation. This tag ignores its body content. - * + * * @return SKIP_BODY */ - public int doStartTag() - { + public int doStartTag() { return SKIP_BODY; } @@ -167,30 +149,26 @@ * store the result in the PageContext under the attribute key * <code>resultId</code>. If an existing key in the PageContext's * attribute map exists, a warning will be written to the log file. - * If errors occur during expression evaluation, they will be reported + * If errors occur during expression evaluation, they will be reported * in the JSP page. If the value returned by the expression is null, - * an attribute named <code>resultId</code> will be removed from + * an attribute named <code>resultId</code> will be removed from * the PageContext's attribute map. - * + * * @return EVAL_PAGE */ public int doEndTag() - 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()); - + 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()); + pageContext.setAttribute(_resultId, _value); - } - 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."); - + } 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."); + pageContext.removeAttribute(_resultId); } @@ -201,8 +179,7 @@ /** * Reset all of the fields of this tag. */ - protected void localRelease() - { + protected void localRelease() { super.localRelease(); _resultId = null; _value = null; 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&rev=125643&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/xml/SerializeXML.java&r1=125642&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/xml/SerializeXML.java&r2=125643 ============================================================================== --- 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 Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.tags.databinding.xml; // java imports + import javax.servlet.jsp.JspException; // internal imports @@ -30,51 +31,49 @@ /** * A tag that serializes an XMLBean into the output of a JSP page in order to move data to the browser for data binding. - * - * @jsptagref.tagdescription - * A tag that serializes an XMLBean into the output of a JSP page in order to move data to the browser for data binding. * + * @jsptagref.tagdescription A tag that serializes an XMLBean into the output of a JSP page in order to move data to the browser for data binding. * @netui:tag name="serializeXML" description="A tag that serializes an XMLBean into the output of a JSP page in order to move data to the browser for data binding." - * @netui.tldx:tag whitespace="indent" + * @netui.tldx:tag whitespace="indent" */ -public class SerializeXML - extends AbstractClassicTag -{ - private static final Logger _logger = Logger.getInstance(SerializeXML.class); +public class SerializeXML + extends AbstractClassicTag { + + private static final Logger LOGGER = Logger.getInstance(SerializeXML.class); private Object _source; private String _divName; - public String getTagName() - { + public String getTagName() { return "SerializeXML"; } /** * @netui:attribute required="true" rtexprvalue="true" */ - public void setSource(Object source) {_source = source;} + public void setSource(Object source) { + _source = source; + } /** * @netui:attribute required="true" rtexprvalue="true" */ - public void setDivName(String divName) {_divName = divName;} + public void setDivName(String divName) { + _divName = divName; + } - public int doStartTag() - { - return SKIP_BODY; + public int doStartTag() { + return SKIP_BODY; } - + public int doEndTag() - throws JspException - { + throws JspException { assert _source != null; - if(_source instanceof XmlObject && _source != null) - { + if(_source instanceof XmlObject && _source != null) { XmlObject xmlObject = (XmlObject)_source; String xml = xmlObject.xmlText(); - + StringBuilder buf = new StringBuilder(); buf.append("<div"); buf.append(" id=\""); @@ -82,22 +81,19 @@ buf.append("\">\n<!--\n"); buf.append(xml); 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"); + if(LOGGER.isInfoEnabled()) LOGGER.info("The expression \"" + _source + "\" resulted in an object that was not an XMLBean"); } - + localRelease(); - - return EVAL_PAGE; + + return EVAL_PAGE; } - public void localRelease() - { + public void localRelease() { super.localRelease(); _source = null; Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/HtmlExceptionFormatter.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/HtmlExceptionFormatter.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/HtmlExceptionFormatter.java&r1=125642&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/HtmlExceptionFormatter.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/HtmlExceptionFormatter.java (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/HtmlExceptionFormatter.java Wed Jan 19 11:00:31 2005 @@ -26,43 +26,44 @@ /** * Format a [EMAIL PROTECTED] java.lang.Throwable} so that it displays well in HTML. - */ -public class HtmlExceptionFormatter -{ - /** An XHTML line break */ + */ +public class HtmlExceptionFormatter { + + /** + * An XHTML line break + */ private static final String HTML_LINE_BREAK = "<br/>"; /* @TODO: is the formatting of Throwable.printStackTrace() dependent on the platform? */ - /** The end of line character to replace with an HTML line break */ + /** + * The end of line character to replace with an HTML line break + */ private static final String LINE_BREAK = "\n"; - + private static final String CAUSED_BY = "caused by "; /** * Format an exception into XHTML. - * + * <p/> * Optionally include a message and the stack trace. - * + * <p/> * The formatted exception will have line breaks replaced with XHTML line breaks for display * in HTML. The String message of the cause will be included, and the stack trace of the * cause is optionally included given the value of <code>includeStackTrace</code> * - * @param message the message to include with the formatted exception. This is in addition to the message in the stack trace. - * @param t a Throwable exception to format + * @param message the message to include with the formatted exception. This is in addition to the message in the stack trace. + * @param t a Throwable exception to format * @param includeStackTrace a boolean that determines whether to include the stack trace in the formatted output * @return the formatted error message, optionally including the stack trace. */ - public static String format(String message, Throwable t, boolean includeStackTrace) - { + public static String format(String message, Throwable t, boolean includeStackTrace) { StringBuilder buf = new StringBuilder(); - if (message != null) - { + if(message != null) { buf.append(message); Throwable cause = discoverRootCause(t); - if (cause != null) - { + if(cause != null) { buf.append(HTML_LINE_BREAK); buf.append(CAUSED_BY); buf.append(": "); @@ -70,9 +71,8 @@ } } - if (includeStackTrace) - { - if (message != null) + if(includeStackTrace) { + if(message != null) buf.append(HTML_LINE_BREAK); String st = addStackTrace(t); @@ -80,8 +80,7 @@ Throwable rootCause = null; Throwable tmp = t; - while (hasRootCause(tmp) && (rootCause = discoverRootCause(tmp)) != null) - { + while(hasRootCause(tmp) && (rootCause = discoverRootCause(tmp)) != null) { st = addStackTrace(rootCause); buf.append(HTML_LINE_BREAK); buf.append(st); @@ -92,8 +91,7 @@ return buf.toString().replaceAll(LINE_BREAK, HTML_LINE_BREAK); } - private static final String addStackTrace(Throwable t) - { + private static final String addStackTrace(Throwable t) { StringBuilder buf = new StringBuilder(); StringWriter sw = new StringWriter(); PrintWriter pw = new PrintWriter(sw); @@ -111,23 +109,21 @@ buf.append(lineOne); buf.append("</span>"); buf.append(rest); - } - else { + } else { buf.append(sw.toString()); } return buf.toString(); } - private static final boolean hasRootCause(Throwable t) - { + private static final boolean hasRootCause(Throwable t) { if(t.getCause() == null && (t instanceof JspException || t instanceof ServletException || t instanceof ELException)) return true; - else return false; + else + return false; } - private static final Throwable discoverRootCause(Throwable t) - { + private static final Throwable discoverRootCause(Throwable t) { Throwable cause = null; if(t instanceof JspException) cause = ((JspException)t).getRootCause(); @@ -135,7 +131,8 @@ cause = ((ServletException)t).getRootCause(); else if(t instanceof ELException) cause = ((ELException)t).getRootCause(); - else cause = t.getCause(); + else + cause = t.getCause(); return cause; } Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/ClassLevelCache.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/ClassLevelCache.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/ClassLevelCache.java&r1=125642&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/ClassLevelCache.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/ClassLevelCache.java (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/ClassLevelCache.java Wed Jan 19 11:00:31 2005 @@ -23,77 +23,66 @@ /** * Thread-safe cache that is stored statically per-Class. - */ -public final class ClassLevelCache -{ + */ +public final class ClassLevelCache { + private static ConcurrentHashMap _classCaches = new ConcurrentHashMap(); private ConcurrentHashMap _caches = new ConcurrentHashMap(); - - - public static ClassLevelCache getCache( Class c ) - { + + + public static ClassLevelCache getCache(Class c) { String className = c.getName(); - ClassLevelCache cache = ( ClassLevelCache ) _classCaches.get( className ); - - if ( cache == null ) - { + ClassLevelCache cache = (ClassLevelCache)_classCaches.get(className); + + if(cache == null) { cache = new ClassLevelCache(); - _classCaches.put( className, cache ); + _classCaches.put(className, cache); } - + return cache; } - - protected ClassLevelCache() - { - } - - public Object get( String majorKey, String minorKey ) - { - ConcurrentHashMap cache = ( ConcurrentHashMap ) _caches.get( majorKey ); - return cache != null ? cache.get( minorKey ) : null; - } - - public Object getCacheObject( String cacheID ) - { - return _caches.get( cacheID ); - } - - public void setCacheObject( String cacheID, Object object ) - { - _caches.put( cacheID, object ); - } - - public Map getCacheMap( String cacheID ) - { - return getCacheMap( cacheID, true ); - } - - public Map getCacheMap( String cacheID, boolean createIfMissing ) - { - ConcurrentHashMap cache = ( ConcurrentHashMap ) _caches.get( cacheID ); - - if ( cache == null && createIfMissing ) - { + + protected ClassLevelCache() { + } + + public Object get(String majorKey, String minorKey) { + ConcurrentHashMap cache = (ConcurrentHashMap)_caches.get(majorKey); + return cache != null ? cache.get(minorKey) : null; + } + + public Object getCacheObject(String cacheID) { + return _caches.get(cacheID); + } + + public void setCacheObject(String cacheID, Object object) { + _caches.put(cacheID, object); + } + + public Map getCacheMap(String cacheID) { + return getCacheMap(cacheID, true); + } + + public Map getCacheMap(String cacheID, boolean createIfMissing) { + ConcurrentHashMap cache = (ConcurrentHashMap)_caches.get(cacheID); + + if(cache == null && createIfMissing) { cache = new ConcurrentHashMap(); - _caches.put( cacheID, cache ); + _caches.put(cacheID, cache); } - + return cache; } - - public void put( String cacheID, String minorKey, Object value ) - { + + public void put(String cacheID, String minorKey, Object value) { // // ConcurrentHashMap can't accept null. For now we'll just assert; if it becomes necessary to add null, // then we can use a marker value. // assert value != null; - getCacheMap( cacheID ).put( minorKey, value ); + getCacheMap(cacheID).put(minorKey, value); } - - public static void clearAll() - { + + public static void clearAll() { _classCaches.clear(); } } Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/MethodCache.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/MethodCache.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/MethodCache.java&r1=125642&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/MethodCache.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/MethodCache.java (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/MethodCache.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.util.cache; // java imports + import java.lang.reflect.Method; import java.util.concurrent.ConcurrentHashMap; @@ -30,72 +31,65 @@ /** * @exclude */ -public class MethodCache -{ - private static final Logger _logger = Logger.getInstance(MethodCache.class); +public class MethodCache { + + private static final Logger LOGGER = Logger.getInstance(MethodCache.class); private final ConcurrentHashMap _methodCache; - + /** * */ - public MethodCache() - { + public MethodCache() { _methodCache = new ConcurrentHashMap(); } /** * */ - public final Method[] getMethods(Class type) - { - if(_logger.isDebugEnabled()) _logger.debug("type: " + type + " hash code: " + type.hashCode()); + public final Method[] getMethods(Class type) { + if(LOGGER.isDebugEnabled()) LOGGER.debug("type: " + type + " hash code: " + type.hashCode()); Object obj = _methodCache.get(type); - - if(obj == null) - { + + if(obj == null) { obj = type.getMethods(); _methodCache.put(type, obj); } return (Method[])obj; } - + /** * */ - public final Method getMethod(Class type, String methodName, int argCount) - { - if(_logger.isDebugEnabled()) _logger.debug("Get method \"" + methodName + "\" from type \"" + type + "\" with " + argCount + " params"); + public final Method getMethod(Class type, String methodName, int argCount) { + if(LOGGER.isDebugEnabled()) LOGGER.debug("Get method \"" + methodName + "\" from type \"" + type + "\" with " + argCount + " params"); if(methodName == null) return null; Method[] methods = getMethods(type); - for(int i = 0; i < methods.length; i++) - { + for(int i = 0; i < methods.length; i++) { if(methods[i].getName().equals(methodName) && (argCount == methods[i].getParameterTypes().length)) return methods[i]; } - + return null; } /** * */ - public final Method getMethod(Class type, String methodName, String[] argTypes) - { + public final Method getMethod(Class type, String methodName, String[] argTypes) { if(methodName == null) return null; Method[] methods = getMethods(type); Class[] parameterTypes = null; - for(int i = 0; i < methods.length; i++) - { + for(int i = 0; i < methods.length; i++) { // method names don't match if(!methods[i].getName().equals(methodName)) continue; @@ -110,13 +104,10 @@ else if((argTypes == null || argTypes.length == 0) && !(parameterTypes.length == 0)) continue; // method matching arg count; check argument types - else if(parameterTypes != null && parameterTypes.length == argTypes.length) - { + else if(parameterTypes != null && parameterTypes.length == argTypes.length) { boolean match = true; - for(int j = 0; j < parameterTypes.length; j++) - { - if(!parameterTypes[j].getName().equals(argTypes[j])) - { + for(int j = 0; j < parameterTypes.length; j++) { + if(!parameterTypes[j].getName().equals(argTypes[j])) { match = false; break; } @@ -127,18 +118,16 @@ return null; } - + /** * */ - public final Method getMethod(Class type, String methodName, Class[] argTypes) - { + public final Method getMethod(Class type, String methodName, Class[] argTypes) { if(argTypes == null) return getMethod(type, methodName, (String[])null); - + String[] typeStrs = new String[argTypes.length]; - for(int i = 0; i < argTypes.length; i++) - { + for(int i = 0; i < argTypes.length; i++) { typeStrs[i] = argTypes[i].getName(); } Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/PropertyCache.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/PropertyCache.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/PropertyCache.java&r1=125642&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/PropertyCache.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/PropertyCache.java (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/PropertyCache.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.util.cache; // java imports + import java.beans.Introspector; import java.beans.IntrospectionException; import java.beans.PropertyDescriptor; @@ -39,82 +40,71 @@ /** * The PropertyCache is used to track the JavaBean properties and public * fields of a set of classes that are stored in the cache. This implementation - * provides a significant speed-up when looking-up reflected metadata + * provides a significant speed-up when looking-up reflected metadata * of Java classes. It is primarily used in the NetUI expression engine - * to provide fast access to the properties and fields of classes + * to provide fast access to the properties and fields of classes * against which expressions are being evaluated. * * @exclude */ -public class PropertyCache -{ - private static final Logger _logger = Logger.getInstance(PropertyCache.class); +public class PropertyCache { + + private static final Logger LOGGER = Logger.getInstance(PropertyCache.class); private final ConcurrentHashMap _classCache; - public PropertyCache() - { + public PropertyCache() { _classCache = new ConcurrentHashMap(); } /** - * Get an array of [EMAIL PROTECTED] java.beans.PropertyDescriptor} objects that + * Get an array of [EMAIL PROTECTED] java.beans.PropertyDescriptor} objects that * describe JavaBean properties of the given <code>type</code>. This * array <b>should not</b> be modified. - * + * * @param type the [EMAIL PROTECTED] java.lang.Class} whose JavaBean properties to find * @return an array of [EMAIL PROTECTED] java.beans.PropertyDescriptor} objects that describe the JavaBean properties */ - public final PropertyDescriptor[] getPropertyDescriptors(Class type) - { + public final PropertyDescriptor[] getPropertyDescriptors(Class type) { CachedClass cc = getCachedClass(type); return (cc != null ? cc.getPropertyDescriptors() : null); } - public final Method getPropertyGetter(Class type, String property) - { + public final Method getPropertyGetter(Class type, String property) { CachedClass cc = getCachedClass(type); if(cc == null) return null; CachedProperty cp = cc.getProperty(property); return (cp != null ? cp.getReadMethod() : null); } - public final Method getPropertySetter(Class type, String property) - { + public final Method getPropertySetter(Class type, String property) { CachedClass cc = getCachedClass(type); if(cc == null) return null; CachedProperty cp = cc.getProperty(property); return (cp != null ? cp.getWriteMethod() : null); } - public final Class getPropertyType(Class type, String property) - { + public final Class getPropertyType(Class type, String property) { CachedClass cc = getCachedClass(type); if(cc == null) return null; CachedProperty cp = cc.getProperty(property); return (cp != null ? cp.getType() : null); } - public final Field getField(Class type, String field) - { + public final Field getField(Class type, String field) { CachedClass cc = getCachedClass(type); return (cc != null ? cc.getField(field) : null); } - private final CachedClass getCachedClass(Class type) - { + private final CachedClass getCachedClass(Class type) { Object obj = _classCache.get(type); - if(obj == null) - { - try - { + if(obj == null) { + try { obj = new CachedClass(type); _classCache.put(type, obj); - } - catch(Exception e) - { - if(_logger.isErrorEnabled()) - _logger.error("Error introspecting a class of type \"" + type + "\" when determining its JavaBean property info", e); + } catch(Exception e) { + if(LOGGER.isErrorEnabled()) + LOGGER.error("Error introspecting a class of type \"" + type + "\" when determining its JavaBean property info", e); return null; } } @@ -125,56 +115,46 @@ /** * @exclude */ - private class CachedClass - { + private class CachedClass { + private Class type = null; private HashMap props = null; private HashMap fields = null; private PropertyDescriptor[] pds = null; - + CachedClass(Class type) - throws IntrospectionException - { + throws IntrospectionException { this.type = type; init(type); } - + private void init(Class type) - throws IntrospectionException - { + throws IntrospectionException { props = new HashMap(); - - if(Modifier.isPublic(type.getModifiers())) - { + + if(Modifier.isPublic(type.getModifiers())) { PropertyDescriptor[] pds = Introspector.getBeanInfo(type).getPropertyDescriptors(); - for(int i = 0; i < pds.length; i++) - { + for(int i = 0; i < pds.length; i++) { props.put(pds[i].getName(), new CachedProperty(pds[i])); } - + fields = new HashMap(); Field[] fs = type.getFields(); - for(int i = 0; i < fs.length; i++) - { + for(int i = 0; i < fs.length; i++) { if(Modifier.isPublic(fs[i].getModifiers()) && - !Modifier.isStatic(fs[i].getModifiers())) + !Modifier.isStatic(fs[i].getModifiers())) fields.put(fs[i].getName(), new CachedField(fs[i])); } - } - else // not looking at a public class, get all of the JavaBean PDs off of its interfaces + } else // not looking at a public class, get all of the JavaBean PDs off of its interfaces { // look on the public interfaces on this class and all superclasses - for (Class c = type; c != null; c = c.getSuperclass()) - { + for(Class c = type; c != null; c = c.getSuperclass()) { Class[] interfaces = c.getInterfaces(); - for(int i = 0; i < interfaces.length; i++) - { + for(int i = 0; i < interfaces.length; i++) { Class iface = interfaces[i]; - if(Modifier.isPublic(iface.getModifiers())) - { + if(Modifier.isPublic(iface.getModifiers())) { PropertyDescriptor[] pds = Introspector.getBeanInfo(iface).getPropertyDescriptors(); - for(int j = 0; j < pds.length; j++) - { + for(int j = 0; j < pds.length; j++) { if(!props.containsKey(pds[j].getName())) props.put(pds[j].getName(), new CachedProperty(pds[j])); } @@ -184,14 +164,12 @@ // look on the nearest public base class Class baseClass = type.getSuperclass(); - while(!Modifier.isPublic(baseClass.getModifiers())) - { + while(!Modifier.isPublic(baseClass.getModifiers())) { baseClass = baseClass.getSuperclass(); } PropertyDescriptor[] pds = Introspector.getBeanInfo(baseClass).getPropertyDescriptors(); - for(int j = 0; j < pds.length; j++) - { + for(int j = 0; j < pds.length; j++) { if(!props.containsKey(pds[j].getName())) props.put(pds[j].getName(), new CachedProperty(pds[j])); } @@ -199,37 +177,31 @@ // look for the public fields on this base class fields = new HashMap(); Field[] fs = baseClass.getFields(); - for(int i = 0; i < fs.length; i++) - { + for(int i = 0; i < fs.length; i++) { if(Modifier.isPublic(fs[i].getModifiers()) && !Modifier.isStatic(fs[i].getModifiers())) fields.put(fs[i].getName(), new CachedField(fs[i])); } } - if(props.size() > 0) - { + if(props.size() > 0) { pds = new PropertyDescriptor[props.size()]; Iterator iterator = props.values().iterator(); - for(int i = 0; iterator.hasNext(); i++) - { + for(int i = 0; iterator.hasNext(); i++) { pds[i] = ((CachedProperty)iterator.next()).getPropertyDescriptor(); } } } - - PropertyDescriptor[] getPropertyDescriptors() - { + + PropertyDescriptor[] getPropertyDescriptors() { return pds; } - Field getField(String name) - { + Field getField(String name) { CachedField cf = (CachedField)fields.get(name); return (cf != null ? cf.getField() : null); } - CachedProperty getProperty(String name) - { + CachedProperty getProperty(String name) { return (CachedProperty)props.get(name); } } @@ -237,16 +209,15 @@ /** * @exclude */ - private class CachedProperty - { + private class CachedProperty { + private Method readMethod = null; private Method writeMethod = null; private String name = null; private PropertyDescriptor pd = null; private Class type = null; - CachedProperty(PropertyDescriptor pd) - { + CachedProperty(PropertyDescriptor pd) { this.pd = pd; this.name = pd.getName(); this.readMethod = pd.getReadMethod(); @@ -254,28 +225,46 @@ this.type = pd.getPropertyType(); } - PropertyDescriptor getPropertyDescriptor() {return pd;} - Method getReadMethod() {return readMethod;} - Method getWriteMethod() {return writeMethod;} - String getName() {return name;} - Class getType() {return type;} + PropertyDescriptor getPropertyDescriptor() { + return pd; + } + + Method getReadMethod() { + return readMethod; + } + + Method getWriteMethod() { + return writeMethod; + } + + String getName() { + return name; + } + + Class getType() { + return type; + } } /** * @exclude */ - private class CachedField - { + private class CachedField { + private Field field = null; private String name = null; - CachedField(Field field) - { + CachedField(Field field) { this.name = field.getName(); this.field = field; } - Field getField() {return field;} - String getName() {return name;} + Field getField() { + return field; + } + + String getName() { + return name; + } } } Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigInitializationException.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigInitializationException.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigInitializationException.java&r1=125642&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigInitializationException.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigInitializationException.java (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigInitializationException.java Wed Jan 19 11:00:31 2005 @@ -18,44 +18,40 @@ package org.apache.beehive.netui.util.config; /** - * <p> + * <p/> * Exception thrown when an error occurs loading the NetUI configuration file * into a web application. * </p> */ public class ConfigInitializationException - extends Exception -{ - /** + extends Exception { + + /** * Default constructor. - */ - public ConfigInitializationException() - { + */ + public ConfigInitializationException() { super(); } - /** - * @param message - */ - public ConfigInitializationException(String message) - { + /** + * @param message + */ + public ConfigInitializationException(String message) { super(message); } - /** - * @param cause - */ - public ConfigInitializationException(Throwable cause) - { + /** + * @param cause + */ + public ConfigInitializationException(Throwable cause) { super(cause); } - /** - * @param message - * @param cause - */ - public ConfigInitializationException(String message, Throwable cause) - { + /** + * @param message + * @param cause + */ + public ConfigInitializationException(String message, Throwable cause) { super(message, cause); } } Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigUtil.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigUtil.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigUtil.java&r1=125642&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigUtil.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigUtil.java (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigUtil.java Wed Jan 19 11:00:31 2005 @@ -30,52 +30,52 @@ import org.apache.xmlbeans.XmlError; /** - * <p> + * <p/> * Utility class for reading properties from the NetUI configuration file. * <br/> * <br/> * The webapp runtime is read from the InputStream passed to the [EMAIL PROTECTED] #init(InputStream)} method. * The configuration should be initialized with this method and a valid [EMAIL PROTECTED] java.io.InputStream} * before the first time the [EMAIL PROTECTED] #getConfig()} method is called. If the configuration - * has not been initialized, [EMAIL PROTECTED] #getConfig()} will initialize a bare bones runtime + * has not been initialized, [EMAIL PROTECTED] #getConfig()} will initialize a bare bones runtime * configuration. Depending on the web application, this default configuration - * may lead to runtime errors. + * may lead to runtime errors. + * <br/> * <br/> - * <br/> * </p> */ -public class ConfigUtil -{ +public class ConfigUtil { + // @todo: need to change NetuiConfigDocument.NetuiConfig to NetUIConfig // @todo: need to provide a read-only implementation so that users can't edit the config file on the fly private static final Logger LOGGER = Logger.getInstance(ConfigUtil.class); private static final String DEFAULT_CONFIG = "org/apache/beehive/netui/util/config/netui-config-default.xml"; - + private static NetuiConfigDocument _config = null; /* do not construct */ - protected ConfigUtil() {} + protected ConfigUtil() { + } /** - * <p> + * <p/> * Initialize the NetUI configuration data. * <br/> * <br/> * This method can be called exactly once in a J2EE web application. The - * [EMAIL PROTECTED] java.io.InputStream} parameter should reference a + * [EMAIL PROTECTED] java.io.InputStream} parameter should reference a * netui-config.xml file. If an error occurs loading the configuration * file, a [EMAIL PROTECTED] ConfigInitializationException} will be thrown. * </p> - * + * * @param is the [EMAIL PROTECTED] java.io.InputStream} from which to read the configuration file * @throws ConfigInitializationException thrown when an error occurs loading the configuration file - * or when the configuration is reinitialized. + * or when the configuration is reinitialized. */ public static final void init(InputStream is) - throws ConfigInitializationException - { + throws ConfigInitializationException { if(_config != null) throw new ConfigInitializationException("Config initialization already completed; unable to reload the NetUI config file."); @@ -90,37 +90,33 @@ * * @param is The [EMAIL PROTECTED] java.io.InputStream} that contains the config document to load * @throws ConfigInitializationException thrown when an error occurs loading the - * configuration file. + * configuration file. */ protected static final void internalInit(InputStream is) throws ConfigInitializationException { // when initialized with a null InputStream, revert to using a default, barebones config file - if(is == null) - { + if(is == null) { ClassLoader cl = Thread.currentThread().getContextClassLoader(); is = cl.getResourceAsStream(DEFAULT_CONFIG); if(is == null) - throw new ConfigInitializationException("The NetUI runtime could not find the default config file. " + - "The webapp may not function properly."); + throw new ConfigInitializationException("The NetUI runtime could not find the default config file. " + + "The webapp may not function properly."); if(LOGGER.isInfoEnabled()) - LOGGER.info("Loading the default NetUI config file. The runtime will be configured " + - "with a set of minimum parameters."); + LOGGER.info("Loading the default NetUI config file. The runtime will be configured " + + "with a set of minimum parameters."); } - if(_config == null) - { - try - { + if(_config == null) { + try { XmlOptions loadOptions = new XmlOptions(); loadOptions.setLoadLineNumbers(); _config = NetuiConfigDocument.Factory.parse(is, loadOptions); } - // XmlException | IOException - catch(Exception ex) - { + // XmlException | IOException + catch(Exception ex) { assert ex instanceof XmlException || ex instanceof IOException; throw new ConfigInitializationException("Unable load the NetUI config file. Cause: " + ex, ex); @@ -136,13 +132,11 @@ boolean isValid = _config.validate(validateOptions); // Throw an exception if the XML is invalid. - if (!isValid) - { + if(!isValid) { StringBuilder msg = new StringBuilder("Invalid NetUI configuration file."); - for (int i = 0; i < errorList.size(); i++) - { - XmlError error = (XmlError) errorList.get(i); + for(int i = 0; i < errorList.size(); i++) { + XmlError error = (XmlError)errorList.get(i); msg.append("\n line "); msg.append(error.getLine()); msg.append(": "); @@ -160,10 +154,9 @@ * Get the NetUI configuration object. * * @return a configuration bean that contains data - * parsed from the netui-config.xml file. + * parsed from the netui-config.xml file. */ - public static NetuiConfig getConfig() - { + public static NetuiConfig getConfig() { if(_config != null) { return _config.getNetuiConfig(); } @@ -171,14 +164,13 @@ If the config file wasn't initialized, attempt to initialize a configuration from the default config file contained in the utility JAR. */ - else - { + else { /* This hopefully never happens and would only occur if the default config file isn't found in the util JAR. */ if(LOGGER.isErrorEnabled()) LOGGER.error("An error occurred parsing the default config file. " + - "The NetUI runtime is not properly configured."); + "The NetUI runtime is not properly configured."); throw new IllegalStateException("The NetUI runtime could not find the default config file. The webapp may not function properly."); } Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedIllegalArgumentException.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedIllegalArgumentException.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedIllegalArgumentException.java&r1=125642&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedIllegalArgumentException.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedIllegalArgumentException.java (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedIllegalArgumentException.java Wed Jan 19 11:00:31 2005 @@ -27,27 +27,23 @@ * @exclude */ public class LocalizedIllegalArgumentException - extends IllegalArgumentException -{ + extends IllegalArgumentException { + private String _localizedMessage = null; - public LocalizedIllegalArgumentException() - { + public LocalizedIllegalArgumentException() { super(); } - public LocalizedIllegalArgumentException(String message) - { + public LocalizedIllegalArgumentException(String message) { super(message); } - public void setLocalizedMessage(String localizedMessage) - { + public void setLocalizedMessage(String localizedMessage) { _localizedMessage = localizedMessage; } - public String getLocalizedMessage() - { + public String getLocalizedMessage() { return (_localizedMessage != null ? _localizedMessage : getMessage()); } } Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedIllegalStateException.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedIllegalStateException.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedIllegalStateException.java&r1=125642&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedIllegalStateException.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedIllegalStateException.java (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedIllegalStateException.java Wed Jan 19 11:00:31 2005 @@ -27,27 +27,23 @@ * @exclude */ public class LocalizedIllegalStateException - extends IllegalStateException -{ + extends IllegalStateException { + private String _localizedMessage = null; - public LocalizedIllegalStateException() - { + public LocalizedIllegalStateException() { super(); } - public LocalizedIllegalStateException(String message) - { + public LocalizedIllegalStateException(String message) { super(message); } - public void setLocalizedMessage(String localizedMessage) - { + public void setLocalizedMessage(String localizedMessage) { _localizedMessage = localizedMessage; } - public String getLocalizedMessage() - { + public String getLocalizedMessage() { return (_localizedMessage != null ? _localizedMessage : getMessage()); } } Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedUnsupportedOperationException.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedUnsupportedOperationException.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedUnsupportedOperationException.java&r1=125642&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedUnsupportedOperationException.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedUnsupportedOperationException.java (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedUnsupportedOperationException.java Wed Jan 19 11:00:31 2005 @@ -27,27 +27,23 @@ * @exclude */ public class LocalizedUnsupportedOperationException - extends UnsupportedOperationException -{ + extends UnsupportedOperationException { + private String _localizedMessage = null; - public LocalizedUnsupportedOperationException() - { + public LocalizedUnsupportedOperationException() { super(); } - public LocalizedUnsupportedOperationException(String message) - { + public LocalizedUnsupportedOperationException(String message) { super(message); } - public void setLocalizedMessage(String localizedMessage) - { + public void setLocalizedMessage(String localizedMessage) { _localizedMessage = localizedMessage; } - public String getLocalizedMessage() - { + public String getLocalizedMessage() { return (_localizedMessage != null ? _localizedMessage : getMessage()); } } Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ArrayIterator.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ArrayIterator.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ArrayIterator.java&r1=125642&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ArrayIterator.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ArrayIterator.java (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ArrayIterator.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.util.iterator; // java imports + import java.lang.reflect.Array; import java.util.Iterator; @@ -39,67 +40,65 @@ * method. */ public class ArrayIterator - implements Iterator -{ + implements Iterator { + private static final Logger logger = Logger.getInstance(ArrayIterator.class); - /** The array object supplied to the iterator */ + /** + * The array object supplied to the iterator + */ private Object _array; - /** The total number of elements in the array */ + /** + * The total number of elements in the array + */ private int _totalElements; - /** The current element being accessed */ + /** + * The current element being accessed + */ private int _currentElement; - public ArrayIterator(Object array) - { - if(array != null) - { - if (!array.getClass().isArray()) - // throw new IllegalStateException("Can not create an array iterator from an object that is not an array"); + public ArrayIterator(Object array) { + if(array != null) { + if(!array.getClass().isArray()) + // throw new IllegalStateException("Can not create an array iterator from an object that is not an array"); throw new IllegalStateException(Bundle.getErrorString("ArrayIterator_notAnArray")); - + _array = array; _totalElements = Array.getLength(_array); } } - public boolean hasNext() - { + public boolean hasNext() { if(_array == null) return false; - else - { - if (_currentElement < _totalElements) + else { + if(_currentElement < _totalElements) return true; - else return false; + else + return false; } } - public Object next() - { - if (logger.isDebugEnabled()) - { + public Object next() { + if(logger.isDebugEnabled()) { logger.debug("Current element: " + _currentElement); logger.debug("Total elements: " + _totalElements); } - if (_currentElement >= _totalElements) + if(_currentElement >= _totalElements) throw new NoSuchElementException(Bundle.getErrorString("IteratorFactory_Iterator_noSuchElement")); Object nextElement = null; - try - { + try { nextElement = Array.get(_array, _currentElement); - } - catch (Exception e) - { - if (logger.isDebugEnabled()) + } catch(Exception e) { + if(logger.isDebugEnabled()) logger.debug("Caught exception: " + e.getClass().getName()); - throw new NoSuchElementException(Bundle.getErrorString("ArrayIterator_arrayError", new Object[] {_array.getClass().getName()})); + throw new NoSuchElementException(Bundle.getErrorString("ArrayIterator_arrayError", new Object[]{_array.getClass().getName()})); } _currentElement++; @@ -107,8 +106,7 @@ return nextElement; } - public void remove() - { - throw new UnsupportedOperationException(Bundle.getErrorString("IteratorFactory_Iterator_removeUnsupported", new Object[] {this.getClass().getName()})); + public void remove() { + throw new UnsupportedOperationException(Bundle.getErrorString("IteratorFactory_Iterator_removeUnsupported", new Object[]{this.getClass().getName()})); } } Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/AtomicObjectIterator.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/AtomicObjectIterator.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/AtomicObjectIterator.java&r1=125642&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/AtomicObjectIterator.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/AtomicObjectIterator.java (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/AtomicObjectIterator.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.util.iterator; // java imports + import java.util.Iterator; import java.util.NoSuchElementException; @@ -29,38 +30,38 @@ /** */ public class AtomicObjectIterator - implements Iterator -{ - /** The object that should be wrapped in the iterator */ + implements Iterator { + + /** + * The object that should be wrapped in the iterator + */ private Object _object; - /** A boolean to track if the single object in this iterator has been returned */ + /** + * A boolean to track if the single object in this iterator has been returned + */ private boolean _nextCalled = false; - AtomicObjectIterator(Object object) - { + AtomicObjectIterator(Object object) { _object = object; } - public boolean hasNext() - { + public boolean hasNext() { if(_nextCalled || _object == null) return false; - else return true; + else + return true; } - public Object next() - { - if(!_nextCalled && _object != null) - { + public Object next() { + if(!_nextCalled && _object != null) { _nextCalled = true; return _object; - } - else throw new NoSuchElementException(Bundle.getErrorString("IteratorFactory_Iterator_noSuchElement")); + } else + throw new NoSuchElementException(Bundle.getErrorString("IteratorFactory_Iterator_noSuchElement")); } - public void remove() - { - throw new UnsupportedOperationException(Bundle.getErrorString("IteratorFactory_Iterator_removeUnsupported", new Object[] {this.getClass().getName()})); + public void remove() { + throw new UnsupportedOperationException(Bundle.getErrorString("IteratorFactory_Iterator_removeUnsupported", new Object[]{this.getClass().getName()})); } } Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/EmptyIterator.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/EmptyIterator.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/EmptyIterator.java&r1=125642&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/EmptyIterator.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/EmptyIterator.java (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/EmptyIterator.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.util.iterator; // java imports + import java.util.Iterator; import java.util.NoSuchElementException; @@ -30,19 +31,20 @@ * */ public class EmptyIterator - implements Iterator -{ - EmptyIterator() {} + implements Iterator { + + EmptyIterator() { + } - public boolean hasNext() {return false;} + public boolean hasNext() { + return false; + } - public Object next() - { + public Object next() { throw new NoSuchElementException(Bundle.getErrorString("IteratorFactory_Iterator_noSuchElement")); } - public void remove() - { - throw new UnsupportedOperationException(Bundle.getErrorString("IteratorFactory_Iterator_removeUnsupported", new Object[] {this.getClass().getName()})); + public void remove() { + throw new UnsupportedOperationException(Bundle.getErrorString("IteratorFactory_Iterator_removeUnsupported", new Object[]{this.getClass().getName()})); } } Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/EnumerationIterator.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/EnumerationIterator.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/EnumerationIterator.java&r1=125642&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/EnumerationIterator.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/EnumerationIterator.java (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/EnumerationIterator.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.util.iterator; // java imports + import java.util.Enumeration; import java.util.Iterator; import java.util.NoSuchElementException; @@ -32,32 +33,30 @@ * from an [EMAIL PROTECTED] java.util.Enumeration}. */ public class EnumerationIterator - implements Iterator -{ + implements Iterator { + private Enumeration _enum = null; - public EnumerationIterator(Enumeration e) - { + public EnumerationIterator(Enumeration e) { _enum = e; } - public boolean hasNext() - { + public boolean hasNext() { if(_enum == null) return false; - else return _enum.hasMoreElements(); + else + return _enum.hasMoreElements(); } - public Object next() - { + public Object next() { if(_enum == null || hasNext() == false) throw new NoSuchElementException(Bundle.getErrorString("IteratorFactory_Iterator_noSuchElement")); - else return _enum.nextElement(); + else + return _enum.nextElement(); } - public void remove() - { - throw new UnsupportedOperationException(Bundle.getErrorString("IteratorFactory_Iterator_removeUnsupported", - new Object[] {this.getClass().getName()})); + public void remove() { + throw new UnsupportedOperationException(Bundle.getErrorString("IteratorFactory_Iterator_removeUnsupported", + new Object[]{this.getClass().getName()})); } } Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java&r1=125642&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.util.iterator; // java imports + import java.io.InputStream; import java.util.ArrayList; @@ -40,32 +41,31 @@ // external imports /** - * <code>IteratorFactory</code> provides a way to create an + * <code>IteratorFactory</code> provides a way to create an * <code>Iterator</code> for different kinds of objects. The supported types * are: * <ul> - * <li><code>java.util.Iterator</code></li> - * <li><code>java.util.Collection</code></li> - * <li><code>java.util.Map</code></li> - * <li><code>javax.sql.RowSet</code></li> - * <li><code>java.util.Enumeration</code></li> - * <li>Any Java Object array</li> + * <li><code>java.util.Iterator</code></li> + * <li><code>java.util.Collection</code></li> + * <li><code>java.util.Map</code></li> + * <li><code>javax.sql.RowSet</code></li> + * <li><code>java.util.Enumeration</code></li> + * <li>Any Java Object array</li> * </ul> - * <p> - * If a <code>java.util.Iterator</code> is supplied, the + * <p/> + * If a <code>java.util.Iterator</code> is supplied, the * <code>Iterator</code> will simply be returned to the caller. - * <p> - * If an object type not listed above is supplied the object will be wrapped in + * <p/> + * If an object type not listed above is supplied the object will be wrapped in * an iterator that has a single item, the provided object. */ -public class IteratorFactory -{ - private static final Logger _logger = Logger.getInstance(IteratorFactory.class); +public class IteratorFactory { + + private static final Logger LOGGER = Logger.getInstance(IteratorFactory.class); public static final Iterator EMPTY_ITERATOR = new EmptyIterator(); private static final Map _plantMap; - static - { + static { _plantMap = new LinkedHashMap(); initialize(); @@ -77,26 +77,22 @@ * * @param object the object to build an iterator from * @return an iterator for the supplied object or <code>null</code> - * * @deprecated */ public static Iterator makeIterator(Object object) - throws IteratorFactoryException - { - try - { + throws IteratorFactoryException { + try { return createIterator(object); } - // throw an IteratorFactoryException if anything goes - // wrong creating an Iterator - catch(Exception e) - { + // throw an IteratorFactoryException if anything goes + // wrong creating an Iterator + catch(Exception e) { Class objectType = object != null ? object.getClass() : null; String message = "An error occurred creating an iterator for type \"" + objectType + "\""; throw new IteratorFactoryException(message, e, objectType); } } - + /** * Create a new <code>Iterator</code> for the supplied object. If the * passed object is null, this method will return null; @@ -104,36 +100,26 @@ * @param object the object to build an iterator from * @return an iterator for the supplied object or <code>null</code> */ - public static final Iterator createIterator(Object object) - { - if (_logger.isDebugEnabled()) - _logger.debug("Trying to make an iterator for class: " + (object == null ? "null" : object.getClass().getName())); - - if(object == null) - { + public static final Iterator createIterator(Object object) { + if(LOGGER.isDebugEnabled()) + LOGGER.debug("Trying to make an iterator for class: " + (object == null ? "null" : object.getClass().getName())); + + if(object == null) { // if the object is null we will return a null. The caller will // have to grab the EMPTY_ITERATOR if it wants to handle this. return null; } - if(object instanceof Iterator) - { + if(object instanceof Iterator) { return (Iterator)object; - } - else if(object instanceof Collection) - { + } else if(object instanceof Collection) { Collection collection = (Collection)object; return collection.iterator(); - } - else if(object instanceof Map) - { + } else if(object instanceof Map) { return new MapIterator((Map)object); - } - else if(object.getClass().isArray()) - { + } else if(object.getClass().isArray()) { return new ArrayIterator(object); - } - else if(object instanceof Enumeration) + } else if(object instanceof Enumeration) return new EnumerationIterator((Enumeration)object); else if(object instanceof ResultSet && !(object instanceof RowSet)) return new ResultSetIterator((ResultSet)object); @@ -141,88 +127,75 @@ // check to see if there is a registered IteratorPlant that can handle this type Iterator ret = null; Iterator factories = _plantMap.keySet().iterator(); - while(factories.hasNext()) - { + while(factories.hasNext()) { IteratorPlant plant = (IteratorPlant)_plantMap.get(factories.next()); ret = plant.createIterator(object); if(ret != null) return ret; } - + return new AtomicObjectIterator(object); } - + /** * Initialize the configuration parameters used to build Iterator objects * for custom types. - */ - private static final void initialize() - { + */ + private static final void initialize() { Map map = readFromConfig(); if(map != null) loadFactories(map); } - private static final Map readFromConfig() - { + private static final Map readFromConfig() { NetuiConfig config = ConfigUtil.getConfig(); if(config == null) return null; - IteratorFactories factories = config.getIteratorFactories(); + IteratorFactories factories = config.getIteratorFactories(); if(factories == null) return null; - org.apache.beehive.netui.util.config.bean.IteratorFactories.IteratorFactory[] factoryArray = + org.apache.beehive.netui.util.config.bean.IteratorFactories.IteratorFactory[] factoryArray = factories.getIteratorFactoryArray(); if(factoryArray == null) return null; - + LinkedHashMap map = new LinkedHashMap(); - for(int i = 0; i < factoryArray.length; i++) - { + for(int i = 0; i < factoryArray.length; i++) { map.put(factoryArray[i].getName(), factoryArray[i].getFactoryClass()); } - + return map; } - private static final void loadFactories(Map factories) - { + private static final void loadFactories(Map factories) { Iterator iterator = factories.keySet().iterator(); - while(iterator.hasNext()) - { + while(iterator.hasNext()) { String name = (String)iterator.next(); String className = (String)factories.get(name); IteratorPlant plant = null; - try - { + try { Class type = Class.forName(className); plant = (IteratorPlant)type.newInstance(); - } - catch(ClassNotFoundException cnf) - { - if(_logger.isWarnEnabled()) - _logger.warn("Could not create an IteratorPlant for type \"" + className + "\" because the implementation class could not be found."); - + } catch(ClassNotFoundException cnf) { + if(LOGGER.isWarnEnabled()) + LOGGER.warn("Could not create an IteratorPlant for type \"" + className + "\" because the implementation class could not be found."); + continue; - } - catch(Exception e) - { + } catch(Exception e) { assert e instanceof InstantiationException || e instanceof IllegalAccessException; - if(_logger.isWarnEnabled()) - _logger.warn("Could not create an IteratorPlant for type \"" + className + "\" because an error occurred creating the plant. Cause: " + e, e); + if(LOGGER.isWarnEnabled()) + LOGGER.warn("Could not create an IteratorPlant for type \"" + className + "\" because an error occurred creating the plant. Cause: " + e, e); continue; } - if(_plantMap.containsKey(name)) - { - if(_logger.isWarnEnabled()) - _logger.warn("Overwriting a previously defined IteratorPlant named \"" + name + - "\" with a new IteratorPlant of type \"" + className + "\""); - } - else if(_logger.isInfoEnabled()) - _logger.info("Adding an IteratorPlant named \"" + name + "\" with implementation \"" + className + "\""); - + if(_plantMap.containsKey(name)) { + if(LOGGER.isWarnEnabled()) + LOGGER.warn("Overwriting a previously defined IteratorPlant named \"" + name + + "\" with a new IteratorPlant of type \"" + className + "\""); + } else if(LOGGER.isInfoEnabled()) + LOGGER.info("Adding an IteratorPlant named \"" + name + "\" with implementation \"" + className + "\""); + _plantMap.put(name, plant); } } @@ -230,10 +203,10 @@ /** * @exclude */ - public abstract static class IteratorPlant - { + public abstract static class IteratorPlant { + /** - * If it is possible to create an iterator for this type, do so. + * If it is possible to create an iterator for this type, do so. * Otherwise return null. */ public abstract Iterator createIterator(Object value); Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactoryException.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactoryException.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactoryException.java&r1=125642&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactoryException.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactoryException.java (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactoryException.java Wed Jan 19 11:00:31 2005 @@ -29,39 +29,33 @@ * will be available from the <code>getType</code> call. */ public class IteratorFactoryException - extends Exception -{ + extends Exception { + private Class _type = null; - public IteratorFactoryException() - { + public IteratorFactoryException() { super(); } - public IteratorFactoryException(String message) - { + public IteratorFactoryException(String message) { super(message); } - public IteratorFactoryException(String message, Throwable t, Class type) - { + public IteratorFactoryException(String message, Throwable t, Class type) { super(message, t); _type = type; } - public IteratorFactoryException(String message, Class type) - { + public IteratorFactoryException(String message, Class type) { this(message); _type = type; } - public Class getType() - { + public Class getType() { return _type; } - public String getTypeName() - { + public String getTypeName() { return (_type != null ? _type.getName() : null); } } Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/MapIterator.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/MapIterator.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/MapIterator.java&r1=125642&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/MapIterator.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/MapIterator.java (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/MapIterator.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.util.iterator; // java imports + import java.util.Iterator; import java.util.Map; import java.util.NoSuchElementException; @@ -33,35 +34,36 @@ * map. */ public class MapIterator - implements Iterator -{ - /** An iterator over the map's values */ + implements Iterator { + + /** + * An iterator over the map's values + */ private Iterator _mapIterator = null; - public MapIterator(Map map) - { + public MapIterator(Map map) { if(map != null) _mapIterator = map.values().iterator(); } - public boolean hasNext() - { + public boolean hasNext() { if(_mapIterator == null) return false; - else return _mapIterator.hasNext(); + else + return _mapIterator.hasNext(); } - public Object next() - { + public Object next() { if(_mapIterator == null) throw new NoSuchElementException(Bundle.getErrorString("IteratorFactory_Iterator_noSuchElement")); - else return _mapIterator.next(); + else + return _mapIterator.next(); } - public void remove() - { + public void remove() { if(_mapIterator == null) - throw new UnsupportedOperationException(Bundle.getErrorString("IteratorFactory_Iterator_removeUnsupported", new Object[] {this.getClass().getName()})); - else _mapIterator.remove(); + throw new UnsupportedOperationException(Bundle.getErrorString("IteratorFactory_Iterator_removeUnsupported", new Object[]{this.getClass().getName()})); + else + _mapIterator.remove(); } } Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ResultSetIterator.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ResultSetIterator.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ResultSetIterator.java&r1=125642&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ResultSetIterator.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ResultSetIterator.java (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ResultSetIterator.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.util.iterator; // java imports + import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; @@ -36,38 +37,33 @@ * */ public class ResultSetIterator - implements Iterator -{ - private static final Logger _logger = Logger.getInstance(ResultSetIterator.class); + implements Iterator { + + private static final Logger LOGGER = Logger.getInstance(ResultSetIterator.class); private ResultSet _rs = null; private boolean _calledHasNext = false; private boolean _hasNext = false; private String[] _columnNames = null; - public ResultSetIterator(ResultSet rs) - { + public ResultSetIterator(ResultSet rs) { assert rs != null; _rs = rs; - try - { + try { // handle RSMD here to build a template map that can contain the data for each row ResultSetMetaData _rsmd = _rs.getMetaData(); assert _rsmd != null; - + int cols = _rsmd.getColumnCount(); _columnNames = new String[cols]; - for(int i = 1; i <= cols; i++) - { + for(int i = 1; i <= cols; i++) { String col = _rsmd.getColumnName(i); - if(_logger.isDebugEnabled()) _logger.debug("found column: " + col); - _columnNames[i-1] = col; + if(LOGGER.isDebugEnabled()) LOGGER.debug("found column: " + col); + _columnNames[i - 1] = col; } - } - catch(SQLException sql) - { - if(_logger.isErrorEnabled()) _logger.error("An exception occurred reading ResultSetMetaData from a ResultSet. Cause: " + sql, sql); + } catch(SQLException sql) { + if(LOGGER.isErrorEnabled()) LOGGER.error("An exception occurred reading ResultSetMetaData from a ResultSet. Cause: " + sql, sql); throw new RuntimeException("An exception occurred reading ResultSetMetaData from a ResultSet. Cause: " + sql, sql); } } @@ -75,45 +71,35 @@ /** * @throws SQLException if an exception occurs calling methods on the ResultSet */ - public boolean hasNext() - { - if(!_calledHasNext) - { + public boolean hasNext() { + if(!_calledHasNext) { _calledHasNext = true; - try - { + try { _hasNext = _rs.next(); - } - catch(SQLException sql) - { - if(_logger.isErrorEnabled()) _logger.error("An exception occurred reading from a ResultSet. Cause: " + sql, sql); + } catch(SQLException sql) { + if(LOGGER.isErrorEnabled()) LOGGER.error("An exception occurred reading from a ResultSet. Cause: " + sql, sql); throw new RuntimeException("An exception occurred reading from a ResultSet. Cause: " + sql, sql); } } - if(_logger.isDebugEnabled()) _logger.debug("hasNext: " + _hasNext); + if(LOGGER.isDebugEnabled()) LOGGER.debug("hasNext: " + _hasNext); return _hasNext; } /** - * @throws SQLException if an exception occurs calling methods on the ResultSet + * */ - public Object next() - { + public Object next() { if(_hasNext == false) throw new NoSuchElementException(Bundle.getErrorString("IteratorFactory_Iterator_noSuchElement")); // when next() is called several times in succession, the ResultSet needs to be advanced - if(!_calledHasNext) - { - try - { + if(!_calledHasNext) { + try { _hasNext = _rs.next(); - } - catch(SQLException sql) - { - if(_logger.isErrorEnabled()) _logger.error("An exception occurred reading from a ResultSet. Cause: " + sql, sql); + } catch(SQLException sql) { + if(LOGGER.isErrorEnabled()) LOGGER.error("An exception occurred reading from a ResultSet. Cause: " + sql, sql); throw new RuntimeException("An exception occurred reading from a ResultSet. Cause: " + sql, sql); } @@ -126,27 +112,22 @@ HashMap row = new HashMap(); assert _columnNames != null; - for(int i = 0; i < _columnNames.length; i++) - { + for(int i = 0; i < _columnNames.length; i++) { String key = (String)_columnNames[i]; - try - { + try { Object value = _rs.getObject(key); row.put(key, value); - } - catch(SQLException sql) - { - if(_logger.isErrorEnabled()) _logger.error("An exception occurred reading from a ResultSet. Cause: " + sql, sql); + } catch(SQLException sql) { + if(LOGGER.isErrorEnabled()) LOGGER.error("An exception occurred reading from a ResultSet. Cause: " + sql, sql); throw new RuntimeException("An exception occurred reading from a ResultSet. Cause: " + sql, sql); } } - + return row; } - public void remove() - { - throw new UnsupportedOperationException(Bundle.getErrorString("IteratorFactory_Iterator_removeUnsupported", new Object[] {this.getClass().getName()})); + public void remove() { + throw new UnsupportedOperationException(Bundle.getErrorString("IteratorFactory_Iterator_removeUnsupported", new Object[]{this.getClass().getName()})); } } Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/BaseTypeConverter.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/BaseTypeConverter.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/BaseTypeConverter.java&r1=125642&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/BaseTypeConverter.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/BaseTypeConverter.java (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/BaseTypeConverter.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.util.type; // java imports + import java.util.Locale; // internal imports @@ -28,23 +29,21 @@ * Default implementation of the [EMAIL PROTECTED] TypeConverter} interface. */ public class BaseTypeConverter - implements TypeConverter -{ + implements TypeConverter { + /** * Convert the String to a type. The base implementation - * delegates to the [EMAIL PROTECTED] #convertToObject(java.lang.String, java.util.Locale)} + * delegates to the [EMAIL PROTECTED] #convertToObject(java.lang.String, java.util.Locale)} * method with <code>null</code> for the locale. */ - public Object convertToObject(String value) - { + public Object convertToObject(String value) { return convertToObject(value, null); } /** * Convert the String to a type, optinally using the given locale. */ - public Object convertToObject(String value, Locale locale) - { + public Object convertToObject(String value, Locale locale) { return value; } } Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/DelegatingTypeConverter.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/DelegatingTypeConverter.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/DelegatingTypeConverter.java&r1=125642&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/DelegatingTypeConverter.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/DelegatingTypeConverter.java (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/DelegatingTypeConverter.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.util.type; // java imports + import java.util.Locale; // internal imports @@ -25,29 +26,26 @@ // external imports /** - * Implementation of the [EMAIL PROTECTED] TypeConverter} interface that delegates + * Implementation of the [EMAIL PROTECTED] TypeConverter} interface that delegates * to a [EMAIL PROTECTED] TypeConverter} implementation which doesn't extend - * [EMAIL PROTECTED] BaseTypeConverter}. + * [EMAIL PROTECTED] BaseTypeConverter}. */ public final class DelegatingTypeConverter - extends BaseTypeConverter -{ + extends BaseTypeConverter { + private TypeConverter _converter = null; - public DelegatingTypeConverter(TypeConverter converter) - { + public DelegatingTypeConverter(TypeConverter converter) { super(); assert converter != null; _converter = converter; } - public Object convertToObject(String value) - { + public Object convertToObject(String value) { return _converter.convertToObject(value); } - public Object convertToObject(String value, Locale locale) - { + public Object convertToObject(String value, Locale locale) { return _converter.convertToObject(value); } } Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConversionException.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConversionException.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConversionException.java&r1=125642&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConversionException.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConversionException.java (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConversionException.java Wed Jan 19 11:00:31 2005 @@ -28,57 +28,51 @@ * a type conversion in the [EMAIL PROTECTED] TypeUtils} class. */ public class TypeConversionException - extends RuntimeException -{ + extends RuntimeException { + private String _localizedMessage = null; - /** + /** * Construct a TypeConversionException. - * - */ - public TypeConversionException() - { + */ + public TypeConversionException() { super(); } - /** + /** * Construct a TypeConversionException. - * + * * @param message message describing the error - */ - public TypeConversionException(String message) - { + */ + public TypeConversionException(String message) { super(message); } - /** + /** * Construct a TypeConversionException. - * + * * @param cause Throwable related to the cause of this exception - */ - public TypeConversionException(Throwable cause) - { + */ + public TypeConversionException(Throwable cause) { super(cause); } - /** + /** * Construct a TypeConversionException. * * @param message message describing the error - * @param cause Throwable related to the cause of this exception - */ - public TypeConversionException(String message, Throwable cause) - { + * @param cause Throwable related to the cause of this exception + */ + public TypeConversionException(String message, Throwable cause) { super(message, cause); } /** * Set a localized message describing the cause of this exception. - * + * * @param localizedMessage a localized message */ - public void setLocalizedMessage(String localizedMessage) - { + public void setLocalizedMessage(String localizedMessage) { _localizedMessage = localizedMessage; } @@ -87,8 +81,7 @@ * * @return a localized message string */ - public String getLocalizedMessage() - { + public String getLocalizedMessage() { return (_localizedMessage != null ? _localizedMessage : getMessage()); } } Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverter.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverter.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverter.java&r1=125642&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverter.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverter.java (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverter.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.util.type; // java imports + import java.util.Locale; // internal imports @@ -25,11 +26,11 @@ // external imports /** - * Interface used to define converters for converting Strings into various - * Object types. + * Interface used to define converters for converting Strings into various + * Object types. */ -public interface TypeConverter -{ +public interface TypeConverter { + /** * Convert a String to an Object type * Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverterNotFoundException.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverterNotFoundException.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverterNotFoundException.java&r1=125642&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverterNotFoundException.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverterNotFoundException.java (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverterNotFoundException.java Wed Jan 19 11:00:31 2005 @@ -27,37 +27,31 @@ * */ public class TypeConverterNotFoundException - extends RuntimeException -{ + extends RuntimeException { + private String _localizedMessage = null; - public TypeConverterNotFoundException() - { + public TypeConverterNotFoundException() { super(); } - public TypeConverterNotFoundException(String message) - { + public TypeConverterNotFoundException(String message) { super(message); } - public TypeConverterNotFoundException(String message, Throwable t) - { + public TypeConverterNotFoundException(String message, Throwable t) { super(message, t); } - public TypeConverterNotFoundException(Throwable t) - { + public TypeConverterNotFoundException(Throwable t) { super(t); } - public void setLocalizedMessage(String localizedMessage) - { + public void setLocalizedMessage(String localizedMessage) { _localizedMessage = localizedMessage; } - public String getLocalizedMessage() - { + public String getLocalizedMessage() { return _localizedMessage != null ? _localizedMessage : getMessage(); } } Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeUtils.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeUtils.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeUtils.java&r1=125642&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeUtils.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeUtils.java (original) +++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeUtils.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.util.type; // java imports + import java.io.InputStream; import java.math.BigDecimal; @@ -49,8 +50,8 @@ * * */ -public final class TypeUtils -{ +public final class TypeUtils { + private static final Logger logger = Logger.getInstance(TypeUtils.class); private static final String TYPE_CONVERTER_PROPERTIES = "/properties/netui-typeconverter.properties"; @@ -58,30 +59,29 @@ private static final HashMap _converters = new HashMap(); private static String _toString = null; - static - { + static { // initialize the default type converters initialize(); // read webapp converters loadConverters(); - + if(logger.isInfoEnabled()) logger.info(registeredConvertersToString()); } // do not construct - private TypeUtils() {} + private TypeUtils() { + } /** - * Convert an object from a String to the given type. - * + * Convert an object from a String to the given type. + * * @param value the String to convert - * @param type the type to which to convert the String - * @throws TypeConverterNotFoundException if a TypeConverter for the target type can not be found. + * @param type the type to which to convert the String * @return the Object result of converting the String to the type. + * @throws TypeConverterNotFoundException if a TypeConverter for the target type can not be found. */ - public static final Object convertToObject(String value, Class type) - { + public static final Object convertToObject(String value, Class type) { BaseTypeConverter converter = lookupTypeConverter(type); assert converter != null; return converter.convertToObject(value); @@ -89,110 +89,122 @@ /** * Convert an object from a String to the given type using the specified [EMAIL PROTECTED] java.util.Locale}. - * + * <p/> * The locale is optionally used depending on the implementation of the [EMAIL PROTECTED] TypeConverter} that is used. - * - * @param value the String to convert - * @param type the type to which to convert the String + * + * @param value the String to convert + * @param type the type to which to convert the String * @param locale the locale to use during conversion - * @throws TypeConverterNotFoundException if a TypeConverter for the target type can not be found. * @return the Object result of converting the String to the type. + * @throws TypeConverterNotFoundException if a TypeConverter for the target type can not be found. */ - public static final Object convertToObject(String value, Class type, Locale locale) - { + public static final Object convertToObject(String value, Class type, Locale locale) { BaseTypeConverter converter = lookupTypeConverter(type); assert converter != null; return converter.convertToObject(value, locale); } - public static final byte convertToByte(String value) - {return ((Byte)convertToObject(value, byte.class)).byteValue();} + public static final byte convertToByte(String value) { + return ((Byte)convertToObject(value, byte.class)).byteValue(); + } - public static final boolean convertToBoolean(String value) - {return ((Boolean)convertToObject(value, boolean.class)).booleanValue();} + public static final boolean convertToBoolean(String value) { + return ((Boolean)convertToObject(value, boolean.class)).booleanValue(); + } - public static final char convertToChar(String value) - {return ((Character)convertToObject(value, char.class)).charValue();} + public static final char convertToChar(String value) { + return ((Character)convertToObject(value, char.class)).charValue(); + } - public static final double convertToDouble(String value) - {return ((Double)convertToObject(value, double.class)).doubleValue();} + public static final double convertToDouble(String value) { + return ((Double)convertToObject(value, double.class)).doubleValue(); + } - public static final float convertToFloat(String value) - {return ((Float)convertToObject(value, float.class)).floatValue();} + public static final float convertToFloat(String value) { + return ((Float)convertToObject(value, float.class)).floatValue(); + } - public static final int convertToInt(String value) - {return ((Integer)convertToObject(value, int.class)).intValue();} + public static final int convertToInt(String value) { + return ((Integer)convertToObject(value, int.class)).intValue(); + } - public static final long convertToLong(String value) - {return ((Long)convertToObject(value, long.class)).longValue();} + public static final long convertToLong(String value) { + return ((Long)convertToObject(value, long.class)).longValue(); + } - public static final short convertToShort(String value) - {return ((Short)convertToObject(value, short.class)).shortValue();} + public static final short convertToShort(String value) { + return ((Short)convertToObject(value, short.class)).shortValue(); + } - public static final Byte convertToByteObject(String value) - {return (Byte)convertToObject(value, Byte.class);} + public static final Byte convertToByteObject(String value) { + return (Byte)convertToObject(value, Byte.class); + } - public static final Boolean convertToBooleanObject(String value) - {return (Boolean)convertToObject(value, Boolean.class);} + public static final Boolean convertToBooleanObject(String value) { + return (Boolean)convertToObject(value, Boolean.class); + } - public static final Character convertToCharacterObject(String value) - {return (Character)convertToObject(value, Character.class);} + public static final Character convertToCharacterObject(String value) { + return (Character)convertToObject(value, Character.class); + } - public static final Double convertToDoubleObject(String value) - {return (Double)convertToObject(value, Double.class);} + public static final Double convertToDoubleObject(String value) { + return (Double)convertToObject(value, Double.class); + } - public static final Float convertToFloatObject(String value) - {return (Float)convertToObject(value, Float.class);} + public static final Float convertToFloatObject(String value) { + return (Float)convertToObject(value, Float.class); + } - public static final Integer convertToIntegerObject(String value) - {return (Integer)convertToObject(value, Integer.class);} + public static final Integer convertToIntegerObject(String value) { + return (Integer)convertToObject(value, Integer.class); + } - public static final Long convertToLongObject(String value) - {return (Long)convertToObject(value, Long.class);} + public static final Long convertToLongObject(String value) { + return (Long)convertToObject(value, Long.class); + } - public static final Short convertToShortObject(String value) - {return (Short)convertToObject(value, Short.class);} + public static final Short convertToShortObject(String value) { + return (Short)convertToObject(value, Short.class); + } /** * Internal method used to lookup a [EMAIL PROTECTED] BaseTypeConverter}. * * @param type the target conversion type - * @throws TypeConverterNotFoundException if a TypeConverter for the target type can not be found. * @return a [EMAIL PROTECTED] BaseTypeConverter} to use for conversion + * @throws TypeConverterNotFoundException if a TypeConverter for the target type can not be found. */ - private static final BaseTypeConverter lookupTypeConverter(Class type) - { + private static final BaseTypeConverter lookupTypeConverter(Class type) { BaseTypeConverter converter = (BaseTypeConverter)_converters.get(type); - if(converter == null) - { - String msg = "Could not find a TypeConverter for converting a String to an object of type \"" + - (type != null ? type.getName() : null) + "\""; + if(converter == null) { + String msg = "Could not find a TypeConverter for converting a String to an object of type \"" + + (type != null ? type.getName() : null) + "\""; TypeConverterNotFoundException tcn = new TypeConverterNotFoundException(msg); if(type == null) msg = Bundle.getErrorString("TypeUtils_nullType"); - else msg = Bundle.getErrorString("TypeUtils_noConverterForType", new Object[] {type.getName()}); + else + msg = Bundle.getErrorString("TypeUtils_noConverterForType", new Object[]{type.getName()}); tcn.setLocalizedMessage(msg); - if(logger.isInfoEnabled()) + if(logger.isInfoEnabled()) logger.info(msg); throw tcn; } - + return converter; } - private static String registeredConvertersToString() - { + private static String registeredConvertersToString() { if(_toString != null) return _toString; - + StringBuilder buf = new StringBuilder(128); buf.append(TypeUtils.class.getName() + " regestered converters (class name, TypeConverter implementation):\n"); buf.append(":::::\n"); Iterator iterator = _converters.keySet().iterator(); - while(iterator.hasNext()) - { + while(iterator.hasNext()) { Class key = (Class)iterator.next(); String keyName = key.getName(); String value = (_converters.get(key) != null ? _converters.get(key).getClass().getName() : "null"); @@ -207,26 +219,22 @@ return _toString; } - private static void loadConverters() - { + private static void loadConverters() { Map map = readFromConfig(); - if(map != null) - { + if(map != null) { load(map); map.clear(); } - + map = readFromProperties(); if(map != null) load(map); } - - private static Map readFromProperties() - { + + private static Map readFromProperties() { Properties props = null; InputStream is = null; - try - { + try { is = (TypeUtils.class).getClassLoader().getResourceAsStream(TYPE_CONVERTER_PROPERTIES); if(logger.isDebugEnabled()) logger.debug("InputStream: " + is); @@ -235,59 +243,52 @@ props = new Properties(); props.load(is); - } - catch(Exception e) - { + } catch(Exception e) { if(logger.isWarnEnabled()) logger.warn("Error occurred reading type converter properties file", e); + } finally { + try { + if(is != null) is.close(); + } catch(Exception ignore) { + } } - finally - { - try{if(is != null) is.close();}catch(Exception ignore) {} - } - + LinkedHashMap map = new LinkedHashMap(); Enumeration e = props.propertyNames(); - while(e.hasMoreElements()) - { + while(e.hasMoreElements()) { String key = (String)e.nextElement(); map.put(key, props.getProperty(key)); } - + return map; } - private static final Map readFromConfig() - { + private static final Map readFromConfig() { NetuiConfig config = ConfigUtil.getConfig(); if(config == null) return null; - TypeConverters converters = config.getTypeConverters(); + TypeConverters converters = config.getTypeConverters(); if(converters == null) return null; - org.apache.beehive.netui.util.config.bean.TypeConverters.TypeConverter[] converterArray = + org.apache.beehive.netui.util.config.bean.TypeConverters.TypeConverter[] converterArray = converters.getTypeConverterArray(); if(converterArray == null) return null; - + LinkedHashMap map = new LinkedHashMap(); - for(int i = 0; i < converterArray.length; i++) - { + for(int i = 0; i < converterArray.length; i++) { map.put(converterArray[i].getType(), converterArray[i].getConverterClass()); } - + return map; } - private static void load(Map map) - { + private static void load(Map map) { // load the properties and continue to populate the map Iterator iterator = map.keySet().iterator(); - while(iterator.hasNext()) - { + while(iterator.hasNext()) { String key = (String)iterator.next(); String className = (String)map.get(key); - if((key == null || key.equals(EMPTY_STRING)) || (className == null || className.equals(EMPTY_STRING))) - { + if((key == null || key.equals(EMPTY_STRING)) || (className == null || className.equals(EMPTY_STRING))) { String msg = "Could not create a TypeConverter for type \"" + key + "\" and TypeConverter \"" + className + "\""; if(logger.isWarnEnabled()) logger.warn(msg); @@ -299,12 +300,9 @@ TypeConverter tc = null; // try to find the "convert-to" class - try - { + try { targetClazz = Class.forName(key); - } - catch(ClassNotFoundException cnf) - { + } catch(ClassNotFoundException cnf) { String msg = "Could not create a TypeConverter for type \"" + key + "\" because the target type could not be found."; if(logger.isWarnEnabled()) logger.warn(msg); @@ -312,8 +310,7 @@ } // try to find the TypeConverter implementation - try - { + try { tcClazz = Class.forName(className); tc = (TypeConverter)tcClazz.newInstance(); @@ -322,29 +319,29 @@ // API, which supports Locale-based conversion if(!(tc instanceof BaseTypeConverter)) tc = new DelegatingTypeConverter(tc); - } - catch(ClassNotFoundException cnf) - { - if(logger.isWarnEnabled()) logger.warn("Could not create a TypeConverter for type \"" + key + "\" because the TypeConverter implementation class \"" + - (tcClazz != null ? tcClazz.getName() : null) + "\" could not be found."); - + } catch(ClassNotFoundException cnf) { + if(logger.isWarnEnabled()) + logger.warn("Could not create a TypeConverter for type \"" + key + "\" because the TypeConverter implementation class \"" + + (tcClazz != null ? tcClazz.getName() : null) + "\" could not be found."); + continue; - } - catch(Exception e) - { - if(logger.isWarnEnabled()) logger.warn("Could not create a TypeConverter for type \"" + key + "\" because the implementation class \"" + - (tcClazz != null ? tcClazz.getName() : null) + "\" could not be instantiated."); + } catch(Exception e) { + if(logger.isWarnEnabled()) + logger.warn("Could not create a TypeConverter for type \"" + key + "\" because the implementation class \"" + + (tcClazz != null ? tcClazz.getName() : null) + "\" could not be instantiated."); continue; } // found both classes, warn if overwriting a previous converter. right now, there is no way to get these back if(_converters.containsKey(targetClazz)) - if(logger.isWarnEnabled()) logger.warn("Overwriting a previously defined TypeConverter named \"" + targetClazz + - "\" with a new TypeConverter implementation of type \"" + className + "\""); + if(logger.isWarnEnabled()) + logger.warn("Overwriting a previously defined TypeConverter named \"" + targetClazz + + "\" with a new TypeConverter implementation of type \"" + className + "\""); + + if(logger.isInfoEnabled()) + logger.info("Adding a type converter; target type=\"" + targetClazz.getName() + + "\" TypeConverter implementation=\"" + tc.getClass().getName() + "\""); - if(logger.isInfoEnabled()) logger.info("Adding a type converter; target type=\"" + targetClazz.getName() + - "\" TypeConverter implementation=\"" + tc.getClass().getName() + "\""); - _converters.put(targetClazz, tc); } } @@ -355,313 +352,276 @@ * primitive wrappers, String, and BigDecimal. Types like BigDecimal are included * because JDBC uses these complex types to map SQL types to Java objects. */ - private static void initialize() - { - _converters.put(byte.class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - return (value == null || value.equals(EMPTY_STRING) ? new Byte((byte)0) : new Byte(value.trim())); - } + private static void initialize() { + _converters.put(byte.class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + return (value == null || value.equals(EMPTY_STRING) ? new Byte((byte)0) : new Byte(value.trim())); + } - }); - _converters.put(Byte.class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null || value.equals(EMPTY_STRING)) return null; - else return TypeUtils.convertToObject(value, byte.class); - } - }); + }); + _converters.put(Byte.class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null || value.equals(EMPTY_STRING)) + return null; + else + return TypeUtils.convertToObject(value, byte.class); + } + }); - _converters.put(boolean.class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null || value.equals(EMPTY_STRING)) - return Boolean.FALSE; - - value = value.toLowerCase().trim(); - if(value.equals("on") || value.equals("true")) - return Boolean.TRUE; - else return Boolean.FALSE; - } - }); - _converters.put(Boolean.class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null || value.equals(EMPTY_STRING)) return null; - else return TypeUtils.convertToObject(value, boolean.class); - } - }); + _converters.put(boolean.class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null || value.equals(EMPTY_STRING)) + return Boolean.FALSE; + + value = value.toLowerCase().trim(); + if(value.equals("on") || value.equals("true")) + return Boolean.TRUE; + else + return Boolean.FALSE; + } + }); + _converters.put(Boolean.class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null || value.equals(EMPTY_STRING)) + return null; + else + return TypeUtils.convertToObject(value, boolean.class); + } + }); - _converters.put(char.class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null || value.equals(EMPTY_STRING)) - return new Character('\u0000'); - else return new Character(value.charAt(0)); - } - }); - _converters.put(Character.class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null || value.equals(EMPTY_STRING)) return null; - else return TypeUtils.convertToObject(value, char.class); - } - }); + _converters.put(char.class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null || value.equals(EMPTY_STRING)) + return new Character('\u0000'); + else + return new Character(value.charAt(0)); + } + }); + _converters.put(Character.class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null || value.equals(EMPTY_STRING)) + return null; + else + return TypeUtils.convertToObject(value, char.class); + } + }); - _converters.put(double.class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null || value.equals(EMPTY_STRING)) - return new Double(0.0); - else return new Double(value.trim()); - } - }); - _converters.put(Double.class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null || value.equals(EMPTY_STRING)) return null; - else return TypeUtils.convertToObject(value, double.class); - } - }); + _converters.put(double.class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null || value.equals(EMPTY_STRING)) + return new Double(0.0); + else + return new Double(value.trim()); + } + }); + _converters.put(Double.class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null || value.equals(EMPTY_STRING)) + return null; + else + return TypeUtils.convertToObject(value, double.class); + } + }); - _converters.put(float.class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null || value.equals(EMPTY_STRING)) - return new Float(0.0); - else return new Float(value.trim()); - } - }); - _converters.put(Float.class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null || value.equals(EMPTY_STRING)) return null; - else return TypeUtils.convertToObject(value, float.class); - } - }); + _converters.put(float.class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null || value.equals(EMPTY_STRING)) + return new Float(0.0); + else + return new Float(value.trim()); + } + }); + _converters.put(Float.class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null || value.equals(EMPTY_STRING)) + return null; + else + return TypeUtils.convertToObject(value, float.class); + } + }); - _converters.put(int.class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null || value.equals(EMPTY_STRING)) - return new Integer(0); - else return new Integer(value.trim()); - } - }); - _converters.put(Integer.class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null || value.equals(EMPTY_STRING)) return null; - else return TypeUtils.convertToObject(value, int.class); - } - }); + _converters.put(int.class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null || value.equals(EMPTY_STRING)) + return new Integer(0); + else + return new Integer(value.trim()); + } + }); + _converters.put(Integer.class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null || value.equals(EMPTY_STRING)) + return null; + else + return TypeUtils.convertToObject(value, int.class); + } + }); - _converters.put(long.class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null || value.equals(EMPTY_STRING)) - return new Long(0); - else return new Long(value.trim()); - } - }); - _converters.put(Long.class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null || value.equals(EMPTY_STRING)) return null; - else return TypeUtils.convertToObject(value, long.class); - } - }); + _converters.put(long.class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null || value.equals(EMPTY_STRING)) + return new Long(0); + else + return new Long(value.trim()); + } + }); + _converters.put(Long.class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null || value.equals(EMPTY_STRING)) + return null; + else + return TypeUtils.convertToObject(value, long.class); + } + }); - _converters.put(short.class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null || value.equals(EMPTY_STRING)) - return new Short((short)0); - else return new Short(value.trim()); - } - }); - _converters.put(Short.class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null || value.equals(EMPTY_STRING)) return null; - else return TypeUtils.convertToObject(value, short.class); - } - }); + _converters.put(short.class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null || value.equals(EMPTY_STRING)) + return new Short((short)0); + else + return new Short(value.trim()); + } + }); + _converters.put(Short.class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null || value.equals(EMPTY_STRING)) + return null; + else + return TypeUtils.convertToObject(value, short.class); + } + }); - _converters.put(String.class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null) - return null; - else return value; - } - }); + _converters.put(String.class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null) + return null; + else + return value; + } + }); - _converters.put(java.math.BigDecimal.class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null || value.equals(EMPTY_STRING)) - return null; - else return new BigDecimal(value.trim()); - } - }); + _converters.put(java.math.BigDecimal.class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null || value.equals(EMPTY_STRING)) + return null; + else + return new BigDecimal(value.trim()); + } + }); - _converters.put(java.math.BigInteger.class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null || value.equals(EMPTY_STRING)) - return null; - else return new BigInteger(value.trim()); - } - }); + _converters.put(java.math.BigInteger.class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null || value.equals(EMPTY_STRING)) + return null; + else + return new BigInteger(value.trim()); + } + }); - _converters.put(byte[].class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null || value.equals(EMPTY_STRING)) - return null; - else return value.getBytes(); - } - }); + _converters.put(byte[].class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null || value.equals(EMPTY_STRING)) + return null; + else + return value.getBytes(); + } + }); - _converters.put(Byte[].class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null || value.equals(EMPTY_STRING)) - return null; - else - { - TypeConverter primByte = (TypeConverter)_converters.get(byte.class); - byte[] bytes = value.getBytes(); - Byte[] wBytes = new Byte[bytes.length]; + _converters.put(Byte[].class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null || value.equals(EMPTY_STRING)) + return null; + else { + TypeConverter primByte = (TypeConverter)_converters.get(byte.class); + byte[] bytes = value.getBytes(); + Byte[] wBytes = new Byte[bytes.length]; - for(int i = 0; i < bytes.length; i++) - wBytes[i] = new Byte(bytes[i]); + for(int i = 0; i < bytes.length; i++) + wBytes[i] = new Byte(bytes[i]); - return wBytes; - } + return wBytes; } - }); - - _converters.put(Date.class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null || value.equals(EMPTY_STRING)) return null; - - try - { - if(locale == null) - locale = Locale.getDefault(); - - DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, locale); - return df.parse(value); - } - catch(java.text.ParseException pe) - { - String msg = "Caugnt an error converting a String to a DateFormat.SHORT formatted Date"; - if(logger.isWarnEnabled()) logger.warn(msg, pe); - System.err.println(msg); - - TypeConversionException tce = new TypeConversionException(msg, pe); - tce.setLocalizedMessage(Bundle.getString("TypeUtils_javaUtilDateConvertError", new Object[] {pe.getMessage()})); - - throw tce; - } + } + }); + + _converters.put(Date.class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null || value.equals(EMPTY_STRING)) return null; + + try { + if(locale == null) + locale = Locale.getDefault(); + + DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, locale); + return df.parse(value); + } catch(java.text.ParseException pe) { + String msg = "Caugnt an error converting a String to a DateFormat.SHORT formatted Date"; + if(logger.isWarnEnabled()) logger.warn(msg, pe); + System.err.println(msg); + + TypeConversionException tce = new TypeConversionException(msg, pe); + tce.setLocalizedMessage(Bundle.getString("TypeUtils_javaUtilDateConvertError", new Object[]{pe.getMessage()})); + + throw tce; } - }); + } + }); // http://java.sun.com/j2se/1.4.1/docs/api/java/sql/Date.html - _converters.put(java.sql.Date.class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null || value.equals(EMPTY_STRING)) return null; - - try - { - return java.sql.Date.valueOf(value); - } - catch(Exception e) - { - String msg = "Caught an error converting a String to a java.sql.Date"; - if(logger.isWarnEnabled()) logger.warn(msg, e); - System.err.println(msg); - - TypeConversionException tce = new TypeConversionException(msg, e); - tce.setLocalizedMessage(Bundle.getString("TypeUtils_javaSqlDateConvertError", new Object[] {e.getMessage()})); - throw tce; - } + _converters.put(java.sql.Date.class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null || value.equals(EMPTY_STRING)) return null; + + try { + return java.sql.Date.valueOf(value); + } catch(Exception e) { + String msg = "Caught an error converting a String to a java.sql.Date"; + if(logger.isWarnEnabled()) logger.warn(msg, e); + System.err.println(msg); + + TypeConversionException tce = new TypeConversionException(msg, e); + tce.setLocalizedMessage(Bundle.getString("TypeUtils_javaSqlDateConvertError", new Object[]{e.getMessage()})); + throw tce; } - }); + } + }); // http://java.sun.com/j2se/1.4.1/docs/api/java/sql/Timestamp.html - _converters.put(java.sql.Timestamp.class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null || value.equals(EMPTY_STRING)) return null; - - try - { - return java.sql.Timestamp.valueOf(value); - } - catch(Exception e) - { - String msg = "Caught an error converting a String to a java.sql.Timestamp"; - if(logger.isWarnEnabled()) logger.warn(msg, e); - System.err.println(msg); - - TypeConversionException tce = new TypeConversionException(msg, e); - tce.setLocalizedMessage(Bundle.getString("TypeUtils_javaSqlTimestampConvertError", new Object[] {e.getMessage()})); - throw tce; - } + _converters.put(java.sql.Timestamp.class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null || value.equals(EMPTY_STRING)) return null; + + try { + return java.sql.Timestamp.valueOf(value); + } catch(Exception e) { + String msg = "Caught an error converting a String to a java.sql.Timestamp"; + if(logger.isWarnEnabled()) logger.warn(msg, e); + System.err.println(msg); + + TypeConversionException tce = new TypeConversionException(msg, e); + tce.setLocalizedMessage(Bundle.getString("TypeUtils_javaSqlTimestampConvertError", new Object[]{e.getMessage()})); + throw tce; } - }); + } + }); // http://java.sun.com/j2se/1.4.1/docs/api/java/sql/Time.html - _converters.put(java.sql.Time.class, new BaseTypeConverter() - { - public Object convertToObject(String value, Locale locale) - { - if(value == null || value.equals(EMPTY_STRING)) return null; - - try - { - return java.sql.Time.valueOf(value); - } - catch(Exception e) - { - String msg = "Caught an error converting a String to a java.sql.Time"; - if(logger.isWarnEnabled()) logger.warn(msg, e); - System.err.println(msg); - - TypeConversionException tce = new TypeConversionException(msg, e); - tce.setLocalizedMessage(Bundle.getString("TypeUtils_javaSqlTimeConvertError", new Object[] {e.getMessage()})); - throw tce; - } + _converters.put(java.sql.Time.class, new BaseTypeConverter() { + public Object convertToObject(String value, Locale locale) { + if(value == null || value.equals(EMPTY_STRING)) return null; + + try { + return java.sql.Time.valueOf(value); + } catch(Exception e) { + String msg = "Caught an error converting a String to a java.sql.Time"; + if(logger.isWarnEnabled()) logger.warn(msg, e); + System.err.println(msg); + + TypeConversionException tce = new TypeConversionException(msg, e); + tce.setLocalizedMessage(Bundle.getString("TypeUtils_javaSqlTimeConvertError", new Object[]{e.getMessage()})); + throw tce; } - }); + } + }); } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/BarJavaBean.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/BarJavaBean.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/BarJavaBean.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/BarJavaBean.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/BarJavaBean.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/BarJavaBean.java Wed Jan 19 11:00:31 2005 @@ -26,27 +26,23 @@ /** * */ -public class BarJavaBean -{ +public class BarJavaBean { + private boolean _bool = false; - public BarJavaBean() - { + public BarJavaBean() { _bool = true; } - public boolean getBool() - { + public boolean getBool() { return _bool; } - public void setBool(boolean bool) - { + public void setBool(boolean bool) { _bool = bool; } - public String toString() - { + public String toString() { return "BarJavaBean (" + System.identityHashCode(this) + ")\n\tbool: " + getBool(); } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/ComplexTypeActionForm.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/ComplexTypeActionForm.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/ComplexTypeActionForm.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/ComplexTypeActionForm.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/ComplexTypeActionForm.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/ComplexTypeActionForm.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.test.beans; // java imports + import java.math.BigDecimal; import java.util.ArrayList; @@ -34,8 +35,8 @@ * */ public class ComplexTypeActionForm - extends SimpleTypeActionForm -{ + extends SimpleTypeActionForm { + public Map pubMap = null; public List pubList = null; public SimpleTypeActionForm[] pubArray = null; @@ -49,8 +50,7 @@ private BigDecimal _bigDecimal = null; private Date _date = null; - public ComplexTypeActionForm() - { + public ComplexTypeActionForm() { _map = new HashMap(); _list = new ArrayList(); _array = new SimpleTypeActionForm[10]; @@ -62,51 +62,41 @@ populate(); } - public Map getMap() - { + public Map getMap() { return _map; } - public List getList() - { + public List getList() { return _list; } - public SimpleTypeActionForm[] getArray() - { + public SimpleTypeActionForm[] getArray() { return _array; } - public void setDate(Date date) - { + public void setDate(Date date) { _date = date; } - public Date getDate() - { + public Date getDate() { return _date; } - public void setBigDecimal(BigDecimal bigDecimal) - { + public void setBigDecimal(BigDecimal bigDecimal) { _bigDecimal = bigDecimal; } - - public BigDecimal getBigDecimal() - { + + public BigDecimal getBigDecimal() { return _bigDecimal; } - - private void populate() - { - for(int i = 0; i < sampleData.length; i++) - { + + private void populate() { + for(int i = 0; i < sampleData.length; i++) { _list.add(sampleData[i]); _map.put(mapKeys[i], sampleData[i]); } - for(int i = 0; i < _array.length; i++) - { + for(int i = 0; i < _array.length; i++) { _array[i] = new SimpleTypeActionForm(); } @@ -120,32 +110,32 @@ _map.put("%", "percent"); } - private Object[] sampleData = - {new Boolean(true), - new Byte((byte)42), - new Character('U'), - new Double(42.42), - new Float(3.14), - new Integer(27), - new Long(123456789), - new Short((short)4), - new String("some sample text"), - new SimpleTypeActionForm() - }; - - private String[] mapKeys = - { - "booleanWrapper", - "byteWrapper", - "charWrapper", - "doubleWrapper", - "floatWrapper", - "integerWrapper", - "longWrapper", - "shortWrapper", - "string", - "bean" - }; - + private Object[] sampleData = + {new Boolean(true), + new Byte((byte)42), + new Character('U'), + new Double(42.42), + new Float(3.14), + new Integer(27), + new Long(123456789), + new Short((short)4), + new String("some sample text"), + new SimpleTypeActionForm() + }; + + private String[] mapKeys = + { + "booleanWrapper", + "byteWrapper", + "charWrapper", + "doubleWrapper", + "floatWrapper", + "integerWrapper", + "longWrapper", + "shortWrapper", + "string", + "bean" + }; + } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/FooJavaBean.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/FooJavaBean.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/FooJavaBean.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/FooJavaBean.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/FooJavaBean.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/FooJavaBean.java Wed Jan 19 11:00:31 2005 @@ -26,63 +26,53 @@ /** * */ -public class FooJavaBean -{ +public class FooJavaBean { + private boolean _bool = false; private int _intProperty = -1; private String _text = null; private BarJavaBean _bar = null; - public FooJavaBean() - { + public FooJavaBean() { _bar = new BarJavaBean(); _text = "ATextProperty"; } - public FooJavaBean(String text) - { + public FooJavaBean(String text) { this(); _bar = new BarJavaBean(); _text = text; } - public BarJavaBean getBarJavaBean() - { + public BarJavaBean getBarJavaBean() { return _bar; } - - public void setBarJavaBean(BarJavaBean bar) - { + + public void setBarJavaBean(BarJavaBean bar) { _bar = bar; } - - public String getTextProperty() - { + + public String getTextProperty() { return _text; } - public void setTextProperty(String text) - { + public void setTextProperty(String text) { _text = text; } - public boolean getBooleanProperty() - { + public boolean getBooleanProperty() { return _bool; } - public void setBooleanProperty(boolean bool) - { + public void setBooleanProperty(boolean bool) { _bool = bool; } - public int getIntegerProperty() - { + public int getIntegerProperty() { return _intProperty; } - public void setIntegerProperty(int intProperty) - { + public void setIntegerProperty(int intProperty) { _intProperty = intProperty; } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/IProduct.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/IProduct.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/IProduct.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/IProduct.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/IProduct.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/IProduct.java Wed Jan 19 11:00:31 2005 @@ -23,17 +23,17 @@ // external imports -public interface IProduct -{ +public interface IProduct { + public String getName(); public double getPrice(); + public void setPrice(double price); - public static class Factory - { - public static Object getInstance(String name, double price) - { + public static class Factory { + + public static Object getInstance(String name, double price) { return new Product(name, price); } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/Product.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/Product.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/Product.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/Product.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/Product.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/Product.java Wed Jan 19 11:00:31 2005 @@ -23,25 +23,30 @@ // external imports -class Product - implements IProduct -{ +class Product + implements IProduct { + private String _name; private double _price; - Product(String name, double price) - { + Product(String name, double price) { _name = name; _price = price; } - public String getName() {return _name;} + public String getName() { + return _name; + } + + public double getPrice() { + return _price; + } - public double getPrice() {return _price;} - public void setPrice(double price) {_price = price;} + public void setPrice(double price) { + _price = price; + } - public String toString() - { + public String toString() { return _name + " $" + _price; } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/SimpleTypeActionForm.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/SimpleTypeActionForm.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/SimpleTypeActionForm.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/SimpleTypeActionForm.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/SimpleTypeActionForm.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/SimpleTypeActionForm.java Wed Jan 19 11:00:31 2005 @@ -22,17 +22,17 @@ // internal imports // external imports + import org.apache.struts.action.ActionForm; /** - * This is a Struts ActionForm that provides properties of primitive types and + * This is a Struts ActionForm that provides properties of primitive types and * arrays of those primitive types. The bean is used to test databinding scenarios * that need to work across many different types. - * */ -public class SimpleTypeActionForm - extends ActionForm -{ +public class SimpleTypeActionForm + extends ActionForm { + private String stringProperty = "default string"; private String _StringProperty = "underbar CAP default string"; private String _stringProperty = "underbar default string"; @@ -77,53 +77,43 @@ private Long[] _longWrapperArrayProperty = null; private Short[] _shortWrapperArrayProperty = null; - public void set_StringProperty(String stringProperty) - { + public void set_StringProperty(String stringProperty) { _StringProperty = stringProperty; } - public String get_StringProperty() - { + public String get_StringProperty() { return _StringProperty; } - public void set_stringProperty(String stringProperty) - { + public void set_stringProperty(String stringProperty) { _stringProperty = stringProperty; } - public String get_stringProperty() - { + public String get_stringProperty() { return _stringProperty; } - public void setStringProperty(String stringProperty) - { + public void setStringProperty(String stringProperty) { this.stringProperty = stringProperty; } - public String getStringProperty() - { + public String getStringProperty() { return this.stringProperty; } - public void setStringArrayProperty(String[] stringArrayProperty) - { + public void setStringArrayProperty(String[] stringArrayProperty) { _stringArrayProperty = stringArrayProperty; } - public String[] getStringArrayProperty() - { + public String[] getStringArrayProperty() { return _stringArrayProperty; } - public String getNullProperty() - { + public String getNullProperty() { return _nullProperty; } - public void setNullProperty(String nullProperty) - { + public void setNullProperty(String nullProperty) { _nullProperty = nullProperty; } @@ -133,83 +123,67 @@ * */ - public void setBoolProperty(boolean boolProperty) - { + public void setBoolProperty(boolean boolProperty) { _boolProperty = boolProperty; } - public boolean getBoolProperty() - { + public boolean getBoolProperty() { return _boolProperty; } - public void setIntProperty(int intProperty) - { + public void setIntProperty(int intProperty) { _intProperty = intProperty; } - public int getIntProperty() - { + public int getIntProperty() { return _intProperty; } - public void setCharProperty(char charProperty) - { + public void setCharProperty(char charProperty) { _charProperty = charProperty; } - public char getCharProperty() - { + public char getCharProperty() { return _charProperty; } - public void setByteProperty(byte byteProperty) - { + public void setByteProperty(byte byteProperty) { _byteProperty = byteProperty; } - public byte getByteProperty() - { + public byte getByteProperty() { return _byteProperty; } - public void setShortProperty(short shortProperty) - { + public void setShortProperty(short shortProperty) { _shortProperty = shortProperty; } - public short getShortProperty() - { + public short getShortProperty() { return _shortProperty; } - public void setLongProperty(long longProperty) - { + public void setLongProperty(long longProperty) { _longProperty = longProperty; } - public long getLongProperty() - { + public long getLongProperty() { return _longProperty; } - public void setFloatProperty(float floatProperty) - { + public void setFloatProperty(float floatProperty) { _floatProperty = floatProperty; } - public float getFloatProperty() - { + public float getFloatProperty() { return _floatProperty; } - public void setDoubleProperty(double doubleProperty) - { + public void setDoubleProperty(double doubleProperty) { _doubleProperty = doubleProperty; } - public double getDoubleProperty() - { + public double getDoubleProperty() { return _doubleProperty; } @@ -219,83 +193,67 @@ * */ - public void setBoolArrayProperty(boolean[] boolArrayProperty) - { + public void setBoolArrayProperty(boolean[] boolArrayProperty) { _boolArrayProperty = boolArrayProperty; } - public boolean[] getBoolArrayProperty() - { + public boolean[] getBoolArrayProperty() { return _boolArrayProperty; } - public void setIntArrayProperty(int[] intArrayProperty) - { + public void setIntArrayProperty(int[] intArrayProperty) { _intArrayProperty = intArrayProperty; } - public int[] getIntArrayProperty() - { + public int[] getIntArrayProperty() { return _intArrayProperty; } - public void setCharArrayProperty(char[] charArrayProperty) - { + public void setCharArrayProperty(char[] charArrayProperty) { _charArrayProperty = charArrayProperty; } - public char[] getCharArrayProperty() - { + public char[] getCharArrayProperty() { return _charArrayProperty; } - public void setByteArrayProperty(byte[] byteArrayProperty) - { + public void setByteArrayProperty(byte[] byteArrayProperty) { _byteArrayProperty = byteArrayProperty; } - public byte[] getByteArrayProperty() - { + public byte[] getByteArrayProperty() { return _byteArrayProperty; } - public void setShortArrayProperty(short[] shortArrayProperty) - { + public void setShortArrayProperty(short[] shortArrayProperty) { _shortArrayProperty = shortArrayProperty; } - public short[] getShortArrayProperty() - { + public short[] getShortArrayProperty() { return _shortArrayProperty; } - public void setLongArrayProperty(long[] longArrayProperty) - { + public void setLongArrayProperty(long[] longArrayProperty) { _longArrayProperty = longArrayProperty; } - public long[] getLongArrayProperty() - { + public long[] getLongArrayProperty() { return _longArrayProperty; } - public void setFloatArrayProperty(float[] floatArrayProperty) - { + public void setFloatArrayProperty(float[] floatArrayProperty) { _floatArrayProperty = floatArrayProperty; } - public float[] getFloatArrayProperty() - { + public float[] getFloatArrayProperty() { return _floatArrayProperty; } - public void setDoubleArrayProperty(double[] doubleArrayProperty) - { + public void setDoubleArrayProperty(double[] doubleArrayProperty) { _doubleArrayProperty = doubleArrayProperty; } - public double[] getDoubleArrayProperty() - { + public double[] getDoubleArrayProperty() { return _doubleArrayProperty; } @@ -305,83 +263,67 @@ * */ - public void setBooleanWrapperProperty(Boolean boolWrapperProperty) - { + public void setBooleanWrapperProperty(Boolean boolWrapperProperty) { _boolWrapperProperty = boolWrapperProperty; } - public Boolean getBooleanWrapperProperty() - { + public Boolean getBooleanWrapperProperty() { return _boolWrapperProperty; } - public void setByteWrapperProperty(Byte byteWrapperProperty) - { + public void setByteWrapperProperty(Byte byteWrapperProperty) { _byteWrapperProperty = byteWrapperProperty; } - public Byte getByteWrapperProperty() - { + public Byte getByteWrapperProperty() { return _byteWrapperProperty; } - public void setCharWrapperProperty(Character charWrapperProperty) - { + public void setCharWrapperProperty(Character charWrapperProperty) { _charWrapperProperty = charWrapperProperty; } - public Character getCharWrapperProperty() - { + public Character getCharWrapperProperty() { return _charWrapperProperty; } - public void setDoubleWrapperProperty(Double doubleWrapperProperty) - { + public void setDoubleWrapperProperty(Double doubleWrapperProperty) { _doubleWrapperProperty = doubleWrapperProperty; } - public Double getDoubleWrapperProperty() - { + public Double getDoubleWrapperProperty() { return _doubleWrapperProperty; } - public void setFloatWrapperProperty(Float floatWrapperProperty) - { + public void setFloatWrapperProperty(Float floatWrapperProperty) { _floatWrapperProperty = floatWrapperProperty; } - public Float getFloatWrapperProperty() - { + public Float getFloatWrapperProperty() { return _floatWrapperProperty; } - public void setIntWrapperProperty(Integer intWrapperProperty) - { + public void setIntWrapperProperty(Integer intWrapperProperty) { _intWrapperProperty = intWrapperProperty; } - public Integer getIntWrapperProperty() - { + public Integer getIntWrapperProperty() { return _intWrapperProperty; } - public void setLongWrapperProperty(Long longWrapperProperty) - { + public void setLongWrapperProperty(Long longWrapperProperty) { _longWrapperProperty = longWrapperProperty; } - public Long getLongWrapperProperty() - { + public Long getLongWrapperProperty() { return _longWrapperProperty; } - public void setShortWrapperProperty(Short shortWrapperProperty) - { + public void setShortWrapperProperty(Short shortWrapperProperty) { _shortWrapperProperty = shortWrapperProperty; } - public Short getShortWrapperProperty() - { + public Short getShortWrapperProperty() { return _shortWrapperProperty; } @@ -391,83 +333,67 @@ * */ - public void setBoolWrapperArrayProperty(Boolean[] boolWrapperArrayProperty) - { + public void setBoolWrapperArrayProperty(Boolean[] boolWrapperArrayProperty) { _boolWrapperArrayProperty = boolWrapperArrayProperty; } - public Boolean[] getBoolWrapperArrayProperty() - { + public Boolean[] getBoolWrapperArrayProperty() { return _boolWrapperArrayProperty; } - public void setIntWrapperArrayProperty(Integer[] intWrapperArrayProperty) - { + public void setIntWrapperArrayProperty(Integer[] intWrapperArrayProperty) { _intWrapperArrayProperty = intWrapperArrayProperty; } - public Integer[] getIntWrapperArrayProperty() - { + public Integer[] getIntWrapperArrayProperty() { return _intWrapperArrayProperty; } - public void setCharWrapperArrayProperty(Character[] charWrapperArrayProperty) - { + public void setCharWrapperArrayProperty(Character[] charWrapperArrayProperty) { _charWrapperArrayProperty = charWrapperArrayProperty; } - public Character[] getCharWrapperArrayProperty() - { + public Character[] getCharWrapperArrayProperty() { return _charWrapperArrayProperty; } - public void setByteWrapperArrayProperty(Byte[] byteWrapperArrayProperty) - { + public void setByteWrapperArrayProperty(Byte[] byteWrapperArrayProperty) { _byteWrapperArrayProperty = byteWrapperArrayProperty; } - public Byte[] getByteWrapperArrayProperty() - { + public Byte[] getByteWrapperArrayProperty() { return _byteWrapperArrayProperty; } - public void setShortWrapperArrayProperty(Short[] shortWrapperArrayProperty) - { + public void setShortWrapperArrayProperty(Short[] shortWrapperArrayProperty) { _shortWrapperArrayProperty = shortWrapperArrayProperty; } - public Short[] getShortWrapperArrayProperty() - { + public Short[] getShortWrapperArrayProperty() { return _shortWrapperArrayProperty; } - public void setLongWrapperArrayProperty(Long[] longWrapperArrayProperty) - { + public void setLongWrapperArrayProperty(Long[] longWrapperArrayProperty) { _longWrapperArrayProperty = longWrapperArrayProperty; } - public Long[] getLongWrapperArrayProperty() - { + public Long[] getLongWrapperArrayProperty() { return _longWrapperArrayProperty; } - public void setFloatWrapperArrayProperty(Float[] floatWrapperArrayProperty) - { + public void setFloatWrapperArrayProperty(Float[] floatWrapperArrayProperty) { _floatWrapperArrayProperty = floatWrapperArrayProperty; } - public Float[] getFloatWrapperArrayProperty() - { + public Float[] getFloatWrapperArrayProperty() { return _floatWrapperArrayProperty; } - public void setDoubleWrapperArrayProperty(Double[] doubleWrapperArrayProperty) - { + public void setDoubleWrapperArrayProperty(Double[] doubleWrapperArrayProperty) { _doubleWrapperArrayProperty = doubleWrapperArrayProperty; } - public Double[] getDoubleWrapperArrayProperty() - { + public Double[] getDoubleWrapperArrayProperty() { return _doubleWrapperArrayProperty; } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/databinding/expression/IndexedNameTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/databinding/expression/IndexedNameTest.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/databinding/expression/IndexedNameTest.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/databinding/expression/IndexedNameTest.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/databinding/expression/IndexedNameTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/databinding/expression/IndexedNameTest.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.test.databinding.expression; // java imports + import java.io.InputStream; import javax.servlet.jsp.tagext.Tag; @@ -41,196 +42,161 @@ * This TestCase tests the ability of the IndexedNameInterceptor to correctly * rewrite and qualify "container.item" bound expressions into the correct * binding contexts. The test cases below simulate JSP tag hierarchies that - * could appear in JSP pages when data binding HTML <input> elements - * to nested repeaters or grids. + * could appear in JSP pages when data binding HTML <input> elements + * to nested repeaters or grids. */ public class IndexedNameTest - extends TestCase -{ + extends TestCase { + private static final Logger _logger = Logger.getInstance(IndexedNameTest.class); private IndexedNameTestCase[] _cases = new IndexedNameTestCase[] { - new IndexedNameTestCase("{actionForm.beans[42]}", new ILeafFactory() - { - public Leaf createLeaf(IExpressionQualifier qualifier) - { - SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans}", 42); - return new Leaf(qualifier, root, "{container.item}"); - } - } - ), - new IndexedNameTestCase("{actionForm.beans[42].foo}", new ILeafFactory() - { - public Leaf createLeaf(IExpressionQualifier qualifier) - { - SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans}", 42); - return new Leaf(qualifier, root, "{container.item.foo}"); - } - } - ), - new IndexedNameTestCase("{actionForm.beans[42].beans2[43].foo}", new ILeafFactory() - { - public Leaf createLeaf(IExpressionQualifier qualifier) { - SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans}", 42); - SimpleDataAccessProvider branch = new SimpleDataAccessProvider(qualifier, root, "{container.item.beans2}", 43); - return new Leaf(qualifier, branch, "{container.item.foo}"); - } - } - ), - new IndexedNameTestCase("{pageFlow.beans2[44].foo}", new ILeafFactory() - { - public Leaf createLeaf(IExpressionQualifier qualifier) { - SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans}", 42); - SimpleDataAccessProvider branch1 = new SimpleDataAccessProvider(qualifier, root, "{container.item}", 43); - SimpleDataAccessProvider branch2 = new SimpleDataAccessProvider(qualifier, branch1, "{pageFlow.beans2}", 44); - return new Leaf(qualifier, branch2, "{container.item.foo}"); - } - } - ), - new IndexedNameTestCase("{pageFlow.beans3[45].foo}", new ILeafFactory() - { - public Leaf createLeaf(IExpressionQualifier qualifier) { - SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans}", 42); - SimpleDataAccessProvider branch1 = new SimpleDataAccessProvider(qualifier, root, "{container.item}", 43); - SimpleDataAccessProvider branch2 = new SimpleDataAccessProvider(qualifier, branch1, "{container.item}", 44); - SimpleDataAccessProvider branch3 = new SimpleDataAccessProvider(qualifier, branch2, "{pageFlow.beans3}", 45); - return new Leaf(qualifier, branch3, "{container.item.foo}"); - } - } - ), - new IndexedNameTestCase("{pageFlow.beans[43].values2[44].values3[45].foo}", new ILeafFactory() - { - public Leaf createLeaf(IExpressionQualifier qualifier) { - SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans}", 42); - SimpleDataAccessProvider branch1 = new SimpleDataAccessProvider(qualifier, root, "{pageFlow.beans}", 43); - SimpleDataAccessProvider branch2 = new SimpleDataAccessProvider(qualifier, branch1, "{container.item.values2}", 44); - SimpleDataAccessProvider branch3 = new SimpleDataAccessProvider(qualifier, branch2, "{container.item.values3}", 45); - return new Leaf(qualifier, branch3, "{container.item.foo}"); - } - } - ), - new IndexedNameTestCase("{actionForm.beans[42].values1[43].values2[44].values3[45].foo}", new ILeafFactory() - { - public Leaf createLeaf(IExpressionQualifier qualifier) { - SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans}", 42); - SimpleDataAccessProvider branch1 = new SimpleDataAccessProvider(qualifier, root, "{container.item.values1}", 43); - SimpleDataAccessProvider branch2 = new SimpleDataAccessProvider(qualifier, branch1, "{container.item.values2}", 44); - SimpleDataAccessProvider branch3 = new SimpleDataAccessProvider(qualifier, branch2, "{container.item.values3}", 45); - return new Leaf(qualifier, branch3, "{container.item.foo}"); - } - } - ), - new IndexedNameTestCase("{actionForm.beans[42].foo}", new ILeafFactory() - { - public Leaf createLeaf(IExpressionQualifier qualifier) { - SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans}", 42); - SimpleDataAccessProvider branch = new SimpleDataAccessProvider(qualifier, root, "{container.item.beans2}", 43); - return new Leaf(qualifier, branch, "{container.container.item.foo}"); - } - } - ), - - new IndexedNameTestCase("{actionForm.beans1[42].foo}", new ILeafFactory() - { - public Leaf createLeaf(IExpressionQualifier qualifier) { - SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans1}", 42); - SimpleDataAccessProvider branch1 = new SimpleDataAccessProvider(qualifier, root, "{container.item.beans2}", 43); - SimpleDataAccessProvider branch2 = new SimpleDataAccessProvider(qualifier, branch1, "{container.item.beans3}", 43); - return new Leaf(qualifier, branch2, "{container.container.container.item.foo}"); - } - } - ), - new IndexedNameTestCase("{pageFlow.beans1[42].foo}", new ILeafFactory() - { - public Leaf createLeaf(IExpressionQualifier qualifier) { - SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans1}", 42); - SimpleDataAccessProvider branch1 = new SimpleDataAccessProvider(qualifier, root, "{pageFlow.beans1}", 42); - SimpleDataAccessProvider branch2 = new SimpleDataAccessProvider(qualifier, branch1, "{container.item.beans2}", 43); - SimpleDataAccessProvider branch3 = new SimpleDataAccessProvider(qualifier, branch2, "{container.item.beans3}", 43); - return new Leaf(qualifier, branch3, "{container.container.container.item.foo}"); - } - } - ), - new IndexedNameTestCase("{pageFlow.beans1[42].foo.container.bar}", new ILeafFactory() - { - public Leaf createLeaf(IExpressionQualifier qualifier) { - SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans1}", 42); - SimpleDataAccessProvider branch1 = new SimpleDataAccessProvider(qualifier, root, "{pageFlow.beans1}", 42); - SimpleDataAccessProvider branch2 = new SimpleDataAccessProvider(qualifier, branch1, "{container.item.beans2}", 43); - SimpleDataAccessProvider branch3 = new SimpleDataAccessProvider(qualifier, branch2, "{container.item.beans3}", 43); - return new Leaf(qualifier, branch3, "{container.container.container.item.foo.container.bar}"); - } - } - ), - new IndexedNameTestCase("{pageFlow.beans1[42].foo.container.item}", new ILeafFactory() - { - public Leaf createLeaf(IExpressionQualifier qualifier) { - SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans1}", 42); - SimpleDataAccessProvider branch1 = new SimpleDataAccessProvider(qualifier, root, "{pageFlow.beans1}", 42); - SimpleDataAccessProvider branch2 = new SimpleDataAccessProvider(qualifier, branch1, "{container.item.beans2}", 43); - SimpleDataAccessProvider branch3 = new SimpleDataAccessProvider(qualifier, branch2, "{container.item.beans3}", 43); - return new Leaf(qualifier, branch3, "{container.container.container.item.foo.container.item}"); - } - } - ), - new IndexedNameTestCase("{pageFlow.item.foo.container.item}", new ILeafFactory() - { - public Leaf createLeaf(IExpressionQualifier qualifier) { - SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans1}", 42); - SimpleDataAccessProvider branch1 = new SimpleDataAccessProvider(qualifier, root, "{pageFlow.beans1}", 42); - SimpleDataAccessProvider branch2 = new SimpleDataAccessProvider(qualifier, branch1, "{container.item.beans2}", 43); - SimpleDataAccessProvider branch3 = new SimpleDataAccessProvider(qualifier, branch2, "{container.item.beans3}", 43); - return new Leaf(qualifier, branch3, "{pageFlow.item.foo.container.item}"); - } - } - ), - new IndexedNameTestCase("{pageFlow.container.item.foo.container.item}", new ILeafFactory() - { - public Leaf createLeaf(IExpressionQualifier qualifier) { - SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans1}", 42); - SimpleDataAccessProvider branch1 = new SimpleDataAccessProvider(qualifier, root, "{pageFlow.beans1}", 42); - SimpleDataAccessProvider branch2 = new SimpleDataAccessProvider(qualifier, branch1, "{container.item.beans2}", 43); - SimpleDataAccessProvider branch3 = new SimpleDataAccessProvider(qualifier, branch2, "{container.item.beans3}", 43); - return new Leaf(qualifier, branch3, "{pageFlow.container.item.foo.container.item}"); - } + new IndexedNameTestCase("{actionForm.beans[42]}", new ILeafFactory() { + public Leaf createLeaf(IExpressionQualifier qualifier) { + SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans}", 42); + return new Leaf(qualifier, root, "{container.item}"); + } + }), + new IndexedNameTestCase("{actionForm.beans[42].foo}", new ILeafFactory() { + public Leaf createLeaf(IExpressionQualifier qualifier) { + SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans}", 42); + return new Leaf(qualifier, root, "{container.item.foo}"); + } + }), + new IndexedNameTestCase("{actionForm.beans[42].beans2[43].foo}", new ILeafFactory() { + public Leaf createLeaf(IExpressionQualifier qualifier) { + SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans}", 42); + SimpleDataAccessProvider branch = new SimpleDataAccessProvider(qualifier, root, "{container.item.beans2}", 43); + return new Leaf(qualifier, branch, "{container.item.foo}"); + } + }), + new IndexedNameTestCase("{pageFlow.beans2[44].foo}", new ILeafFactory() { + public Leaf createLeaf(IExpressionQualifier qualifier) { + SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans}", 42); + SimpleDataAccessProvider branch1 = new SimpleDataAccessProvider(qualifier, root, "{container.item}", 43); + SimpleDataAccessProvider branch2 = new SimpleDataAccessProvider(qualifier, branch1, "{pageFlow.beans2}", 44); + return new Leaf(qualifier, branch2, "{container.item.foo}"); + } + }), + new IndexedNameTestCase("{pageFlow.beans3[45].foo}", new ILeafFactory() { + public Leaf createLeaf(IExpressionQualifier qualifier) { + SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans}", 42); + SimpleDataAccessProvider branch1 = new SimpleDataAccessProvider(qualifier, root, "{container.item}", 43); + SimpleDataAccessProvider branch2 = new SimpleDataAccessProvider(qualifier, branch1, "{container.item}", 44); + SimpleDataAccessProvider branch3 = new SimpleDataAccessProvider(qualifier, branch2, "{pageFlow.beans3}", 45); + return new Leaf(qualifier, branch3, "{container.item.foo}"); + } + }), + new IndexedNameTestCase("{pageFlow.beans[43].values2[44].values3[45].foo}", new ILeafFactory() { + public Leaf createLeaf(IExpressionQualifier qualifier) { + SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans}", 42); + SimpleDataAccessProvider branch1 = new SimpleDataAccessProvider(qualifier, root, "{pageFlow.beans}", 43); + SimpleDataAccessProvider branch2 = new SimpleDataAccessProvider(qualifier, branch1, "{container.item.values2}", 44); + SimpleDataAccessProvider branch3 = new SimpleDataAccessProvider(qualifier, branch2, "{container.item.values3}", 45); + return new Leaf(qualifier, branch3, "{container.item.foo}"); + } + }), + new IndexedNameTestCase("{actionForm.beans[42].values1[43].values2[44].values3[45].foo}", new ILeafFactory() { + public Leaf createLeaf(IExpressionQualifier qualifier) { + SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans}", 42); + SimpleDataAccessProvider branch1 = new SimpleDataAccessProvider(qualifier, root, "{container.item.values1}", 43); + SimpleDataAccessProvider branch2 = new SimpleDataAccessProvider(qualifier, branch1, "{container.item.values2}", 44); + SimpleDataAccessProvider branch3 = new SimpleDataAccessProvider(qualifier, branch2, "{container.item.values3}", 45); + return new Leaf(qualifier, branch3, "{container.item.foo}"); + } + }), + new IndexedNameTestCase("{actionForm.beans[42].foo}", new ILeafFactory() { + public Leaf createLeaf(IExpressionQualifier qualifier) { + SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans}", 42); + SimpleDataAccessProvider branch = new SimpleDataAccessProvider(qualifier, root, "{container.item.beans2}", 43); + return new Leaf(qualifier, branch, "{container.container.item.foo}"); + } + }), + + new IndexedNameTestCase("{actionForm.beans1[42].foo}", new ILeafFactory() { + public Leaf createLeaf(IExpressionQualifier qualifier) { + SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans1}", 42); + SimpleDataAccessProvider branch1 = new SimpleDataAccessProvider(qualifier, root, "{container.item.beans2}", 43); + SimpleDataAccessProvider branch2 = new SimpleDataAccessProvider(qualifier, branch1, "{container.item.beans3}", 43); + return new Leaf(qualifier, branch2, "{container.container.container.item.foo}"); + } + }), + new IndexedNameTestCase("{pageFlow.beans1[42].foo}", new ILeafFactory() { + public Leaf createLeaf(IExpressionQualifier qualifier) { + SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans1}", 42); + SimpleDataAccessProvider branch1 = new SimpleDataAccessProvider(qualifier, root, "{pageFlow.beans1}", 42); + SimpleDataAccessProvider branch2 = new SimpleDataAccessProvider(qualifier, branch1, "{container.item.beans2}", 43); + SimpleDataAccessProvider branch3 = new SimpleDataAccessProvider(qualifier, branch2, "{container.item.beans3}", 43); + return new Leaf(qualifier, branch3, "{container.container.container.item.foo}"); + } + }), + new IndexedNameTestCase("{pageFlow.beans1[42].foo.container.bar}", new ILeafFactory() { + public Leaf createLeaf(IExpressionQualifier qualifier) { + SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans1}", 42); + SimpleDataAccessProvider branch1 = new SimpleDataAccessProvider(qualifier, root, "{pageFlow.beans1}", 42); + SimpleDataAccessProvider branch2 = new SimpleDataAccessProvider(qualifier, branch1, "{container.item.beans2}", 43); + SimpleDataAccessProvider branch3 = new SimpleDataAccessProvider(qualifier, branch2, "{container.item.beans3}", 43); + return new Leaf(qualifier, branch3, "{container.container.container.item.foo.container.bar}"); + } + }), + new IndexedNameTestCase("{pageFlow.beans1[42].foo.container.item}", new ILeafFactory() { + public Leaf createLeaf(IExpressionQualifier qualifier) { + SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans1}", 42); + SimpleDataAccessProvider branch1 = new SimpleDataAccessProvider(qualifier, root, "{pageFlow.beans1}", 42); + SimpleDataAccessProvider branch2 = new SimpleDataAccessProvider(qualifier, branch1, "{container.item.beans2}", 43); + SimpleDataAccessProvider branch3 = new SimpleDataAccessProvider(qualifier, branch2, "{container.item.beans3}", 43); + return new Leaf(qualifier, branch3, "{container.container.container.item.foo.container.item}"); + } + }), + new IndexedNameTestCase("{pageFlow.item.foo.container.item}", new ILeafFactory() { + public Leaf createLeaf(IExpressionQualifier qualifier) { + SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans1}", 42); + SimpleDataAccessProvider branch1 = new SimpleDataAccessProvider(qualifier, root, "{pageFlow.beans1}", 42); + SimpleDataAccessProvider branch2 = new SimpleDataAccessProvider(qualifier, branch1, "{container.item.beans2}", 43); + SimpleDataAccessProvider branch3 = new SimpleDataAccessProvider(qualifier, branch2, "{container.item.beans3}", 43); + return new Leaf(qualifier, branch3, "{pageFlow.item.foo.container.item}"); + } + }), + new IndexedNameTestCase("{pageFlow.container.item.foo.container.item}", new ILeafFactory() { + public Leaf createLeaf(IExpressionQualifier qualifier) { + SimpleDataAccessProvider root = new SimpleDataAccessProvider(qualifier, null, "{actionForm.beans1}", 42); + SimpleDataAccessProvider branch1 = new SimpleDataAccessProvider(qualifier, root, "{pageFlow.beans1}", 42); + SimpleDataAccessProvider branch2 = new SimpleDataAccessProvider(qualifier, branch1, "{container.item.beans2}", 43); + SimpleDataAccessProvider branch3 = new SimpleDataAccessProvider(qualifier, branch2, "{container.item.beans3}", 43); + return new Leaf(qualifier, branch3, "{pageFlow.container.item.foo.container.item}"); } - ) + }) }; - + public void testRewrite() - throws Throwable - { + throws Throwable { runSuite(new NetUIELExpressionLanguage()); } protected final void runSuite(ExpressionEngine qualifier) - throws Throwable - { - for(int i = 0; i < _cases.length; i++) - { - try - { + throws Throwable { + for(int i = 0; i < _cases.length; i++) { + try { IndexedNameTestCase test = _cases[i]; test.setExpressionQualifier(qualifier); String exp = test.getExpected(); ILeafFactory factory = test.getLeafFactory(); Leaf leaf = factory.createLeaf(qualifier); - + TestNameInterceptor interceptor = new TestNameInterceptor(leaf, qualifier.getEngineName()); - - String act = interceptor.rewriteName(leaf.getName(),null); - + + String act = interceptor.rewriteName(leaf.getName(), null); + System.out.println("**** act: " + act); System.out.println("**** exp: " + exp); - + if(!exp.equals(act)) throw new IllegalStateException("The expected (" + exp + ") and actual (" + act + "} values do not match for test case [" + i + "]"); } - // this generally poor practice, but because multiple test cases are run for this method, - // we need to catch AssertionError in order to know which test case failed. - catch(Throwable t) - { + // this generally poor practice, but because multiple test cases are run for this method, + // we need to catch AssertionError in order to know which test case failed. + catch(Throwable t) { t.printStackTrace(); throw t; } @@ -242,96 +208,101 @@ * a particular language. The expectation is that 'expr' is of the * form {...} */ - public interface IExpressionQualifier - { + public interface IExpressionQualifier { + public String qualify(String expr); } - + /** * Type that represents an expression language and expression * syntax. The engine name is used to get an expression evaluator * for a particular engine type. This type also implements * the ExpressionQualifier interface, which qualifies an - * expression string into the syntax expected by the - * engine. - * + * expression string into the syntax expected by the + * engine. + * <p/> * Note, this makes the assumption that all expressions are * of the same syntax between the ${...} or {...} tokens. */ public static abstract class ExpressionEngine - implements IExpressionQualifier - { + implements IExpressionQualifier { + private String _engine = null; - public ExpressionEngine(String engine) {_engine = engine;} - public String getEngineName() {return _engine;} + + public ExpressionEngine(String engine) { + _engine = engine; + } + + public String getEngineName() { + return _engine; + } } /** * */ public static class NetUIELExpressionLanguage - extends ExpressionEngine - { - public NetUIELExpressionLanguage() {super("netuiel");} - public String qualify(String expr) {return expr;} + extends ExpressionEngine { + + public NetUIELExpressionLanguage() { + super("netuiel"); + } + + public String qualify(String expr) { + return expr; + } } /** * Type that represents a test case for indexed name rewriting. * This class contains an expected outcome String and a LeafFactory - * which is used to create a hierarchy of IDataAccessProviders. + * which is used to create a hierarchy of IDataAccessProviders. * The IDataAccessProvider hierarchy mimics that which the JSP * tags create when there are nested repeaters / grids in a JSP page. */ public static class IndexedNameTestCase - extends ExpressionQualifiable - { + extends ExpressionQualifiable { + private String _expected = null; private ILeafFactory _factory = null; - - public IndexedNameTestCase(String expected, ILeafFactory factory) - { + + public IndexedNameTestCase(String expected, ILeafFactory factory) { _expected = expected; _factory = factory; } - public String getExpected() - { + public String getExpected() { return qualify(_expected); } - public ILeafFactory getLeafFactory() - { + public ILeafFactory getLeafFactory() { return _factory; } } /** - * An extension to the [EMAIL PROTECTED] IndexedNameInterceptor} that + * An extension to the [EMAIL PROTECTED] IndexedNameInterceptor} that * overrides the getCurrentProvider and getExpressionEvaluator - * methods. This decopules the IndexedNameInterceptor from the - * JSP tags and from the NetUI config file, which dictates the + * methods. This decopules the IndexedNameInterceptor from the + * JSP tags and from the NetUI config file, which dictates the * expression language in use for a page. */ public static class TestNameInterceptor - extends IndexedNameInterceptor - { + extends IndexedNameInterceptor { + private Leaf _leaf = null; private String _engine = null; - public TestNameInterceptor(Leaf leaf, String engine) - { + public TestNameInterceptor(Leaf leaf, String engine) { _leaf = leaf; _engine = engine; } - protected IDataAccessProvider getCurrentProvider(Tag currentTag) - { + protected IDataAccessProvider getCurrentProvider(Tag currentTag) { return _leaf.getProvider(); } - protected ExpressionEvaluator getExpressionEvaluator() - { + protected ExpressionEvaluator getExpressionEvaluator() { if(_logger.isDebugEnabled()) _logger.debug("get expression evaluator named \"" + _engine + "\""); return ExpressionEvaluatorFactory.getInstance(_engine); @@ -342,24 +313,22 @@ * Base type for a class that needs to be able * to qualify an expression using an IExpressionQualifier. */ - public abstract static class ExpressionQualifiable - { + public abstract static class ExpressionQualifiable { + private IExpressionQualifier _qualifier = null; - public ExpressionQualifiable() {} + public ExpressionQualifiable() { + } - public ExpressionQualifiable(IExpressionQualifier qualifier) - { + public ExpressionQualifiable(IExpressionQualifier qualifier) { _qualifier = qualifier; } - public void setExpressionQualifier(IExpressionQualifier qualifier) - { + public void setExpressionQualifier(IExpressionQualifier qualifier) { _qualifier = qualifier; } - protected String qualify(String expression) - { + protected String qualify(String expression) { return _qualifier.qualify(expression); } } @@ -367,59 +336,54 @@ /** * Type that represents a leaf in a IDataAccessProvider hierarchy. * In JSP tag parlance, this class is equivalent to the <netui:label> in this example: - * + * <p/> * <netui-data:repeater dataSource="{actionForm.customers}"> - * <netui:label value="{container.item.name}"/> + * <netui:label value="{container.item.name}"/> * </netui-data:repeater> - * + * <p/> * It is a root that may be parented by a IDataAccessProvider hierarchy. */ public static class Leaf - extends ExpressionQualifiable - { + extends ExpressionQualifiable { + private IDataAccessProvider _provider = null; private String _dataSource = null; - - public Leaf(IExpressionQualifier qualifier, IDataAccessProvider provider, String dataSource) - { + + public Leaf(IExpressionQualifier qualifier, IDataAccessProvider provider, String dataSource) { super(qualifier); _provider = provider; _dataSource = dataSource; } - - public void setExpressionQualifier(IExpressionQualifier qualifier) - { + + public void setExpressionQualifier(IExpressionQualifier qualifier) { super.setExpressionQualifier(qualifier); ((SimpleDataAccessProvider)_provider).setExpressionQualifier(qualifier); } - public String getName() - { + public String getName() { return qualify(_dataSource); } - public IDataAccessProvider getProvider() - { + public IDataAccessProvider getProvider() { return _provider; } } /** - * Non-tag implementation of a data access provider that mimics a - * hierarchy of IDataAccessProviders as would exist in a hierarchy + * Non-tag implementation of a data access provider that mimics a + * hierarchy of IDataAccessProviders as would exist in a hierarchy * of repeaters. */ public static class SimpleDataAccessProvider extends ExpressionQualifiable - implements IDataAccessProvider - { + implements IDataAccessProvider { + private IDataAccessProvider _parent = null; private String _dataSource = null; private int _currentIndex = 42; - - public SimpleDataAccessProvider(IExpressionQualifier qualifier, IDataAccessProvider parent, String dataSource, int currentIndex) - { + + public SimpleDataAccessProvider(IExpressionQualifier qualifier, IDataAccessProvider parent, String dataSource, int currentIndex) { super(qualifier); _parent = parent; @@ -427,73 +391,65 @@ _currentIndex = currentIndex; } - public int getCurrentIndex() - { + public int getCurrentIndex() { return _currentIndex; } - - public Object getCurrentItem() - { + + public Object getCurrentItem() { return new String("some current item"); } - - public String getDataSource() - { + + public String getDataSource() { return qualify(_dataSource); } - - public Object getCurrentMetadata() - { + + public Object getCurrentMetadata() { return null; } - - public IDataAccessProvider getProviderParent() - { + + public IDataAccessProvider getProviderParent() { return _parent; } - + /** * This method indicates that the expression of the repeater is bound into a * client based context. + * * @return <code>true</code> if the expression of this is bound on the client. */ - public boolean isBindingOnClient() - { + public boolean isBindingOnClient() { return false; } - public void setDataSource(String dataSource) - { + public void setDataSource(String dataSource) { } } /** - * Simple interface that is implemented with anonymous inner + * Simple interface that is implemented with anonymous inner * classes in a test case. */ - public static interface ILeafFactory - { + public static interface ILeafFactory { + public Leaf createLeaf(IExpressionQualifier qualifier); } - public IndexedNameTest(String name) - { + public IndexedNameTest(String name) { super(name); } - public static Test suite() - { + public static Test suite() { return new TestSuite(IndexedNameTest.class); } - public static void main(String[] args) - { + public static void main(String[] args) { junit.textui.TestRunner.run(suite()); } protected void setUp() { TestConfigUtil.testInit(); } - - protected void tearDown() {} + + protected void tearDown() { + } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java Wed Jan 19 11:00:31 2005 @@ -36,12 +36,13 @@ public static final String DEFAULT_DATA_GRID_NAME = "testgrid"; /* do not construct */ - private DataGridTestUtil() {} + private DataGridTestUtil() { + } public static final void initQueryString(ServletRequest request, String queryString) { assert Proxy.getInvocationHandler(request) instanceof HttpServletRequestHandler; - HttpServletRequestHandler handler = (HttpServletRequestHandler) Proxy.getInvocationHandler(request); + HttpServletRequestHandler handler = (HttpServletRequestHandler)Proxy.getInvocationHandler(request); handler.setQueryString(queryString); } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortServiceTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortServiceTest.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortServiceTest.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortServiceTest.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortServiceTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortServiceTest.java Wed Jan 19 11:00:31 2005 @@ -49,21 +49,22 @@ SortService svc = SortService.getInstance(getRequest(), _namespace); assert svc.getSorts() == null; } + public void testSingleAscendingSort() { DataGridTestUtil.initQueryString(_request, "netui_sort=" + _namespace + "~CUSTOMERNAME"); SortService svc = SortService.getInstance(getRequest(), _namespace); List<ISort> sorts = svc.getSorts(); assert svc.getSorts() != null; - assert sorts.size()== 1; + assert sorts.size() == 1; assert sorts.get(0).getDirection() == SortDirection.ASCENDING; assert sorts.get(0).getSortExpression().equals("CUSTOMERNAME"); } public void testMultipleSort() { DataGridTestUtil.initQueryString(_request, "?netui_sort=" + _namespace + "~CUSTOMERNAME" + - "&netui_sort=" + _namespace + "~-UNITPRICE&" + - "&netui_sort=productGrid~QUANTITY"); + "&netui_sort=" + _namespace + "~-UNITPRICE&" + + "&netui_sort=productGrid~QUANTITY"); SortService svc = SortService.getInstance(getRequest(), _namespace); List<ISort> sorts = svc.getSorts(); Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AbstractExpressionTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AbstractExpressionTest.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AbstractExpressionTest.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AbstractExpressionTest.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AbstractExpressionTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AbstractExpressionTest.java Wed Jan 19 11:00:31 2005 @@ -92,7 +92,7 @@ protected final void evaluateUpdateExpression(String expression, Object value, ServletRequest request, ServletResponse response, ActionForm form, boolean requestParameter) throws Exception { Object theForm = form; - if (theForm == null) + if(theForm == null) theForm = request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY); VariableResolver vr = ImplicitObjectUtil.getUpdateVariableResolver(theForm, request, response, requestParameter); @@ -124,10 +124,10 @@ protected void useForm(int formId) { Object form = null; - HttpServletRequest request = (HttpServletRequest) getPageContext().getRequest(); - if (formId == SIMPLE_FORM) + HttpServletRequest request = (HttpServletRequest)getPageContext().getRequest(); + if(formId == SIMPLE_FORM) form = request.getAttribute("simpleBean"); - else if (formId == COMPLEX_FORM) + else if(formId == COMPLEX_FORM) form = request.getAttribute("complexBean"); useForm(form); @@ -139,7 +139,7 @@ } protected ActionForm getActionForm() { - HttpServletRequest request = (HttpServletRequest) getPageContext().getRequest(); - return (ActionForm) request.getAttribute(Constants.BEAN_KEY); + HttpServletRequest request = (HttpServletRequest)getPageContext().getRequest(); + return (ActionForm)request.getAttribute(Constants.BEAN_KEY); } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.test.script; // java imports + import java.util.Iterator; import java.util.HashMap; import java.util.Map; @@ -31,11 +32,10 @@ * Unit tests for XScript expression parsing. */ public abstract class AccessTest - extends AbstractExpressionTest -{ + extends AbstractExpressionTest { + public void testAccess() - throws Exception - { + throws Exception { String productName = " Mountain Bike Frame"; getPageContext().setAttribute("iproduct", IProduct.Factory.getInstance(productName, 2500.00)); @@ -45,15 +45,13 @@ } public void testMapAccess() - throws Exception - { + throws Exception { Map map = new HashMap(); map.put("product1", IProduct.Factory.getInstance("Widget Crankset", 400.00)); map.put("product2", IProduct.Factory.getInstance("Widget Bottom Bracket", 60.00)); Iterator iterator = map.entrySet().iterator(); - while(iterator.hasNext()) - { + while(iterator.hasNext()) { Object item = iterator.next(); System.out.println("item type: " + item.getClass().getName()); @@ -67,8 +65,7 @@ } } - public AccessTest(String name) - { + public AccessTest(String name) { super(name); } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/BundleScriptTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/BundleScriptTest.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/BundleScriptTest.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/BundleScriptTest.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/BundleScriptTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/BundleScriptTest.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.test.script; // java imports + import java.util.Locale; import javax.servlet.http.HttpServletRequest; @@ -31,16 +32,14 @@ * */ public abstract class BundleScriptTest - extends AbstractExpressionTest -{ + extends AbstractExpressionTest { public void testSimple() - throws Exception - { + throws Exception { BundleContext bc = createBundleContext(); BundleMap bundleMap = new BundleMap((HttpServletRequest)getPageContext().getRequest(), - getPageContext().getServletContext(), - bc); + getPageContext().getServletContext(), + bc); getPageContext().setAttribute("bundle", bundleMap); bc.addBundle("bundle1", "org/apache/beehive/netui/test/databinding/testdata/bundle1"); @@ -54,8 +53,7 @@ } public void testLocaleSupport() - throws Exception - { + throws Exception { Locale germany = Locale.GERMAN; BundleContext bc = createBundleContext(); @@ -63,8 +61,8 @@ bc.addBundle("bundle2", "org/apache/beehive/netui/test/databinding/testdata/bundle2"); BundleMap bundleMap = new BundleMap((HttpServletRequest)getPageContext().getRequest(), - getPageContext().getServletContext(), - bc); + getPageContext().getServletContext(), + bc); getPageContext().setAttribute("bundle", bundleMap); String val = (String)evaluateExpression("{bundle.bundle1.localHello}", getPageContext()); @@ -79,15 +77,15 @@ /** * Simple test to make sure that BundleMap.toString() doesn't throw exceptions and generally works. + * * @throws Exception */ public void testToString() - throws Exception - { + throws Exception { BundleContext bc = createBundleContext(); BundleMap bundleMap = new BundleMap((HttpServletRequest)getPageContext().getRequest(), - getPageContext().getServletContext(), - bc); + getPageContext().getServletContext(), + bc); // toString an empty map System.out.println("budleMap.toString(): " + bundleMap.toString()); @@ -102,15 +100,13 @@ // toString a BundleMap that has bundles System.out.println("bundleMap.toString(): " + bundleMap.toString()); } - + private BundleContext createBundleContext() - throws Exception - { + throws Exception { return new BundleContext(); } - public BundleScriptTest(String name) - { + public BundleScriptTest(String name) { super(name); } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java Wed Jan 19 11:00:31 2005 @@ -28,123 +28,119 @@ * Unit tests for NetUI EL expression parsing. */ public abstract class ExpressionTest - extends AbstractExpressionTest -{ + extends AbstractExpressionTest { + private static final Logger _logger = Logger.getInstance(ExpressionTest.class); // expression, shouldParse, isExpression, containsExpression, - Object[][] isExprData = - { - {"{pageScope.foo.bar.baz.property}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, - {"{pageScope.foo.bar.baz[42].property.nextProperty}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, - {"\\{pageScope.foo.bar.baz.property}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, - {"{pageScope.foo.bar.baz.property\\}", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE}, - {"{pageScope.foo.bar.baz['\\\"[EMAIL PROTECTED]']}", Boolean.FALSE, Boolean.TRUE, Boolean.TRUE}, - - {"{pageScope.foo.bar.baz[\"\\\"\\\"\\\"\\\"\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, - {"{pageScope.foo.bar.baz[\"\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, - {"{pageScope.foo.bar.baz[\"'\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, // Radar bug: 16763 - {"{pageScope.foo.bar.baz['\"']}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, // Radar bug: 16763 - {"{pageScope.foo.bar.baz[\"[EMAIL PROTECTED]"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, - - {"{", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE, "{"}, - {"{{", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE, "{{"}, - {"\\{", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE, "\\{"}, - {"\\}", Boolean.TRUE, Boolean.FALSE, Boolean.FALSE, "\\}"}, - {"}", Boolean.TRUE, Boolean.FALSE, Boolean.FALSE, "}"}, - {"}}", Boolean.TRUE, Boolean.FALSE, Boolean.FALSE, "}}"}, - {"", Boolean.TRUE, Boolean.FALSE, Boolean.FALSE, ""}, - {"{pageScope.bean._Property}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, - - // Radar 30458 - {"{ pageScope.bean}", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE}, - {"{pageScope. bean}", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE}, - {"{pageScope.bean }", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE}, - {"[EMAIL PROTECTED]", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE}, - {"[EMAIL PROTECTED]", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE}, - {"{}", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE}, - {"[EMAIL PROTECTED]", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE}, - {"{ }", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE}, - - // contain expressions, !expressions - {" {pageScope.foo.bar.baz.property} ", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, - {" {pageScope.foo.bar.baz.property\\} ", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE}, - {" {actionForm} {pageScope.foo.bar.baz.property\\} {container} ", Boolean.FALSE, null, null}, - {" {actionForm} \\{pageScope.foo.bar.baz.property\\} {container} ", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, - {" {container}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, - {"{container} ", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, - {"{container}{actionForm} ", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, - - // nested exceptions - {"{pageScope.foo.bar.baz[{foo.bar.baz.nest}]}", Boolean.FALSE, null, null}, - {"{pageScope.foo.bar.baz[\"{}\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, - {"{pageScope.foo.bar.baz[\"{\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, - {"{pageScope.foo.bar.baz[\"}\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, - {"{pageScope.foo.bar.baz[\"'\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, // FAIL 1/4/2003 -- fixed in AttributeParser - {"{pageScope.foo.bar.baz[\"\\\"\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, // FAIL 1/4/2003 -- fixed in AttributeParser - {"{pageScope.foo.bar.baz[\"{foo.bar.baz}\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, - {"{pageScope.foo.bar.baz[\"\\\\{foo.bar.{baz.nest}}\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, - {"{pageScope.foo.bar.baz[\"\\\\{foo.bar.baz.nest}\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, - - {"this = {pageScope.foo}'", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, - {"this = {pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, - {"this = /{pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, - {"this = \\{pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, - {"this = / {pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, - {"this = \\ {pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, - {"this = @{pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, - {"this = *{pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, - {"this = ({pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, - {"this = [{pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, - {"this = [{pageScope.foo}}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, - {"this = [{pageScope.foo}\"", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, - {"this = [{pageScope.foo}\'", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, - {"/{pageFlow.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, - - {"{pageScope.foo.bar.baz['\"']}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, // FAIL 1/4/2003 -- fixed 05/13-2003 - {"this = '{pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, // FAIL 4/21/2003 - {"this = \"{pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, // FAIL 4/21/2003 - {"this = \'{pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, // FAIL 4/21/2003 - - {"{pageScope.files[\"/foo\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, - {"{pageScope.files[\"{foo\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, - - // ============================ - // Broken test cases - // ============================ - - // @bug: xscript parser -- shouldn't accept {} - //{"{}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, - // @bug: netuiel / xscript? accepted by the latter but not the former -- the string litreal doesn't handle \\{ but \\\\{ works - //{"{pageScope.foo.bar.baz[\"\\{foo.bar.baz.nest}\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, - - // @bug: netuiel parser -- \\{ is broken in el - {"\\\\{pageFlow.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, // FAIL 4/21/2003 -- fixed 05/13-2003 - }; + Object[][] isExprData = + { + {"{pageScope.foo.bar.baz.property}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, + {"{pageScope.foo.bar.baz[42].property.nextProperty}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, + {"\\{pageScope.foo.bar.baz.property}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, + {"{pageScope.foo.bar.baz.property\\}", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE}, + {"{pageScope.foo.bar.baz['\\\"[EMAIL PROTECTED]']}", Boolean.FALSE, Boolean.TRUE, Boolean.TRUE}, + + {"{pageScope.foo.bar.baz[\"\\\"\\\"\\\"\\\"\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, + {"{pageScope.foo.bar.baz[\"\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, + {"{pageScope.foo.bar.baz[\"'\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, // Radar bug: 16763 + {"{pageScope.foo.bar.baz['\"']}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, // Radar bug: 16763 + {"{pageScope.foo.bar.baz[\"[EMAIL PROTECTED]"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, + + {"{", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE, "{"}, + {"{{", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE, "{{"}, + {"\\{", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE, "\\{"}, + {"\\}", Boolean.TRUE, Boolean.FALSE, Boolean.FALSE, "\\}"}, + {"}", Boolean.TRUE, Boolean.FALSE, Boolean.FALSE, "}"}, + {"}}", Boolean.TRUE, Boolean.FALSE, Boolean.FALSE, "}}"}, + {"", Boolean.TRUE, Boolean.FALSE, Boolean.FALSE, ""}, + {"{pageScope.bean._Property}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, + + // Radar 30458 + {"{ pageScope.bean}", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE}, + {"{pageScope. bean}", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE}, + {"{pageScope.bean }", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE}, + {"[EMAIL PROTECTED]", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE}, + {"[EMAIL PROTECTED]", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE}, + {"{}", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE}, + {"[EMAIL PROTECTED]", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE}, + {"{ }", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE}, + + // contain expressions, !expressions + {" {pageScope.foo.bar.baz.property} ", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, + {" {pageScope.foo.bar.baz.property\\} ", Boolean.FALSE, Boolean.FALSE, Boolean.FALSE}, + {" {actionForm} {pageScope.foo.bar.baz.property\\} {container} ", Boolean.FALSE, null, null}, + {" {actionForm} \\{pageScope.foo.bar.baz.property\\} {container} ", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, + {" {container}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, + {"{container} ", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, + {"{container}{actionForm} ", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, + + // nested exceptions + {"{pageScope.foo.bar.baz[{foo.bar.baz.nest}]}", Boolean.FALSE, null, null}, + {"{pageScope.foo.bar.baz[\"{}\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, + {"{pageScope.foo.bar.baz[\"{\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, + {"{pageScope.foo.bar.baz[\"}\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, + {"{pageScope.foo.bar.baz[\"'\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, // FAIL 1/4/2003 -- fixed in AttributeParser + {"{pageScope.foo.bar.baz[\"\\\"\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, // FAIL 1/4/2003 -- fixed in AttributeParser + {"{pageScope.foo.bar.baz[\"{foo.bar.baz}\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, + {"{pageScope.foo.bar.baz[\"\\\\{foo.bar.{baz.nest}}\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, + {"{pageScope.foo.bar.baz[\"\\\\{foo.bar.baz.nest}\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, + + {"this = {pageScope.foo}'", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, + {"this = {pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, + {"this = /{pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, + {"this = \\{pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, + {"this = / {pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, + {"this = \\ {pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, + {"this = @{pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, + {"this = *{pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, + {"this = ({pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, + {"this = [{pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, + {"this = [{pageScope.foo}}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, + {"this = [{pageScope.foo}\"", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, + {"this = [{pageScope.foo}\'", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, + {"/{pageFlow.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, + + {"{pageScope.foo.bar.baz['\"']}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, // FAIL 1/4/2003 -- fixed 05/13-2003 + {"this = '{pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, // FAIL 4/21/2003 + {"this = \"{pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, // FAIL 4/21/2003 + {"this = \'{pageScope.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, // FAIL 4/21/2003 + + {"{pageScope.files[\"/foo\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, + {"{pageScope.files[\"{foo\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, + + // ============================ + // Broken test cases + // ============================ + + // @bug: xscript parser -- shouldn't accept {} + //{"{}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, + // @bug: netuiel / xscript? accepted by the latter but not the former -- the string litreal doesn't handle \\{ but \\\\{ works + //{"{pageScope.foo.bar.baz[\"\\{foo.bar.baz.nest}\"]}", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE}, + + // @bug: netuiel parser -- \\{ is broken in el + {"\\\\{pageFlow.foo}", Boolean.TRUE, Boolean.FALSE, Boolean.TRUE}, // FAIL 4/21/2003 -- fixed 05/13-2003 + }; public void testIsContainsExpression() - throws Exception - { + throws Exception { Object[][] data = isExprData; ExpressionEvaluator ee = getExpressionEvaluator(); - for(int i = 0; i < data.length; i++) - { + for(int i = 0; i < data.length; i++) { String expr = (String)data[i][0]; boolean shouldParse = ((Boolean)data[i][1]).booleanValue(); boolean shouldBeExpr = false; boolean shouldContainExpr = false; - if(shouldParse) - { + if(shouldParse) { shouldBeExpr = ((Boolean)data[i][2]).booleanValue(); shouldContainExpr = ((Boolean)data[i][3]).booleanValue(); } if(_logger.isDebugEnabled()) _logger.debug("Expression \"" + expr + "\" should parse \"" + shouldParse + "\""); - try - { + try { boolean isExpr = ee.isExpression(expr); // should this have succeeded @@ -157,34 +153,33 @@ // should expr contain an expression assertTrue(containsExpr == shouldContainExpr); - } - catch(Throwable t) - { + } catch(Throwable t) { if(_logger.isDebugEnabled()) _logger.debug((shouldParse ? "Failure" : "Expected failure") + " on test [" + i + "] with expression \"" + expr + "\"", t); // success! - if(!shouldParse) - { + if(!shouldParse) { if(_logger.isDebugEnabled()) _logger.debug("Caught expected failure for expression \"" + expr + "\""); continue; - } - else throw new ExpressionTestError("An error occurred parsing test [" + i + "] with expression \"" + expr + "\"", t); + } else + throw new ExpressionTestError("An error occurred parsing test [" + i + "] with expression \"" + expr + "\"", t); } } } - /** Simple sanity check of the FauxPageContext that is used in the rest of these tests */ - public void testPageContext() - { + /** + * Simple sanity check of the FauxPageContext that is used in the rest of these tests + */ + public void testPageContext() { FooJavaBean bean = new FooJavaBean("JunitTestJavaBean"); getPageContext().setAttribute("foo", bean); assertEquals(bean.getTextProperty(), ((FooJavaBean)getPageContext().getAttribute("foo")).getTextProperty()); } - /** Test a simple String read */ + /** + * Test a simple String read + */ public void testStringRead() - throws Exception - { + throws Exception { FooJavaBean bean = new FooJavaBean("JunitTestJavaBean"); getPageContext().setAttribute("foo", bean); @@ -193,8 +188,7 @@ } public void testUnderbarStringRead() - throws Exception - { + throws Exception { Object result = null; result = evaluateExpression("{requestScope.simpleBean._StringProperty}", getPageContext()); @@ -206,76 +200,63 @@ } public void testNullProperty() - throws Exception - { + throws Exception { Object result = evaluateExpression("{requestScope.simpleBean.nullProperty}", getPageContext()); assertNull(result); } public void testCharProperty() - throws Exception - { + throws Exception { Object result = evaluateExpression("{requestScope.simpleBean.charProperty}", getPageContext()); if(!(result instanceof String && ((String)result).equals("a"))) throw new ExpressionTestError("The Character value returned from XScript was not valid.", null); } public void testEmptyReadExpr() - throws Exception - { + throws Exception { Object result = evaluateExpression("{}", getPageContext()); assertNull(result); } - /** This is bad; this test passes w/o exception */ + /** + * This is bad; this test passes w/o exception + */ public void testNonexistentPropertyGet() - throws Exception - { - boolean exception = false; - try - { - evaluateExpression("{requestScope.simpleBean.neverMoreProperty}", getPageContext()); - } - catch(Exception e) - { - exception = true; - } - assertTrue(exception); + throws Exception { + boolean exception = false; + try { + evaluateExpression("{requestScope.simpleBean.neverMoreProperty}", getPageContext()); + } catch(Exception e) { + exception = true; + } + assertTrue(exception); } // Bug 15430 -- make sure that the bean property naming convention is enforced public void test15430() - throws Exception - { + throws Exception { Object result = null; boolean pass = false; - try - { + try { result = evaluateExpression("{requestScope.simpleBean.StringProperty}", getPageContext()); - } - catch(Exception e) - { + } catch(Exception e) { pass = true; } assertTrue(pass); pass = true; - try - { + try { result = evaluateExpression("{requestScope.simpleBean.stringProperty}", getPageContext()); - } - catch(Exception e) - { + } catch(Exception e) { pass = false; } assertTrue(pass); } public void testStrangeCharacters() - throws Exception - { - Object[][] data = + throws Exception { + Object[][] data = { {"{requestScope.complexBean.map[\" \"]}", "space"}, {"{requestScope.complexBean.map[\"*\"]}", "asterisk"}, @@ -285,7 +266,7 @@ {"{requestScope.complexBean.map[' ']}", "space"}, {"{requestScope.complexBean.map['*']}", "asterisk"}, {"{requestScope.complexBean.map['%']}", "percent"}, - + // @bug: netuiel -- these aren't handled {"{requestScope.complexBean.map['\\'']}", "single quote"}, // how do you do this in XScript? {"{requestScope.complexBean.map['\\'\\'']}", "double, single quote"}, @@ -300,10 +281,8 @@ int i = 0; String expr = null; - try - { - for(i = 0; i < data.length; i++) - { + try { + for(i = 0; i < data.length; i++) { expr = (String)data[i][0]; String value = (String)data[i][1]; @@ -312,32 +291,27 @@ assertTrue(value.equals(result)); } - } - catch(Throwable t) - { + } catch(Throwable t) { t.printStackTrace(); throw new ExpressionTestError("An error occurred parsing test [" + i + "] with expression \"" + expr + "\"", t); } } public void testQualify() - throws Exception - { - String[][] data = + throws Exception { + String[][] data = { {"stuff", "actionForm", "{actionForm.stuff}"} }; ExpressionEvaluator ee = ExpressionEvaluatorFactory.getInstance(); - for(int i = 0; i < data.length; i++) - { + for(int i = 0; i < data.length; i++) { String result = ee.qualify(data[i][1], data[i][0]); assertEquals(data[i][2], result); } } - public ExpressionTest(String name) - { + public ExpressionTest(String name) { super(name); } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTestError.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTestError.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTestError.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTestError.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTestError.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTestError.java Wed Jan 19 11:00:31 2005 @@ -26,16 +26,15 @@ /** * An exception that represents a failure executing an expression test. * <br/> - * The JUnit <code>AssertionFailedError</code> class does not have a way to - * set a cause, only a message. This class gives the ability to wrap an + * The JUnit <code>AssertionFailedError</code> class does not have a way to + * set a cause, only a message. This class gives the ability to wrap an * exception, error, etc in a single exception that contains the test case * that failed with the <code>Throwable</code> cause. */ public class ExpressionTestError - extends Exception -{ - public ExpressionTestError(String message, Throwable cause) - { + extends Exception { + + public ExpressionTestError(String message, Throwable cause) { super(message, cause); } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java Wed Jan 19 11:00:31 2005 @@ -34,9 +34,9 @@ /** * */ -public abstract class ExpressionUpdateTest - extends AbstractExpressionTest -{ +public abstract class ExpressionUpdateTest + extends AbstractExpressionTest { + private static final Logger _logger = Logger.getInstance(ExpressionUpdateTest.class); private static final String[] EMPTY_ARRAY = {"", "", ""}; @@ -50,64 +50,57 @@ */ public void testB43011() - throws Exception - { + throws Exception { String[] newValue = {"123", "456"}; - + evaluateUpdateExpression("{actionForm.stringProperty}", newValue, getPageContext().getRequest(), getPageContext().getResponse(), getActionForm()); assertEquals(newValue[1], ((SimpleTypeActionForm)getActionForm()).getStringProperty()); } public void testNonexistentPropertySet() - throws Exception - { + throws Exception { boolean exception = false; - try - { + try { // boolean array String[] boolStrArray = {"true", "false", "false", "true"}; evaluateUpdateExpression("{actionForm.neverMoreProperty}", boolStrArray, getPageContext().getRequest(), - getPageContext().getResponse(), getActionForm()); - } - catch(Exception e) - { + getPageContext().getResponse(), getActionForm()); + } catch(Exception e) { exception = true; } assertTrue(exception); } public void testComplexUpdateExpressionEvaluation() - throws Exception - { + throws Exception { Object[][] data = complexUpdateData; executeComplexTest("complex update expressions", data); } - - /** Test updates of String -> primitive types */ + + /** + * Test updates of String -> primitive types + */ public void testPrimitiveUpdate() - throws Exception - { + throws Exception { Object[][] data = primitiveUpdateData; executeSimpleTest("primitive update", data); } public void testPrimitiveWrapperUpdate() - throws Exception - { + throws Exception { Object[][] data = primitiveWrapperUpdateData; executeSimpleTest("primitive wrapper update", data); } - /** - Test updates of String[] -> primitive[] - Test updates of String[] -> primitiveWrapper[] - */ + /** + * Test updates of String[] -> primitive[] + * Test updates of String[] -> primitiveWrapper[] + */ public void testArrayUpdate() - throws Exception - { + throws Exception { Object[][] data = arrayUpdateData; - + executeSimpleTest("array update test", data); } @@ -115,18 +108,16 @@ * Test for setting complex types into a WebScriptableObject. */ public void testSettingComplexTypes() - throws Exception - { + throws Exception { useForm(COMPLEX_FORM); ServletRequest request = getPageContext().getRequest(); ServletResponse response = getPageContext().getResponse(); Object[][] data = settingComplexTypeData; - for(int i = 0; i < data.length; i++) - { + for(int i = 0; i < data.length; i++) { String expr = (String)data[i][0]; Object act = (Object)data[i][1]; - + System.out.println("=========================== ????????????? form: " + getActionForm()); evaluateUpdateExpression(expr, act, request, response, getActionForm(), false); @@ -150,7 +141,7 @@ // primitive boolean[] test expr = "{actionForm.boolArrayProperty}"; - evaluateUpdateExpression(expr, new String[] {"true", "true", "false", "true", "true"}, request, response, getActionForm()); + evaluateUpdateExpression(expr, new String[]{"true", "true", "false", "true", "true"}, request, response, getActionForm()); assertTrue(((boolean[])evaluateExpression(expr, getPageContext()))[0]); assertTrue(((boolean[])evaluateExpression(expr, getPageContext()))[1]); assertTrue(!((boolean[])evaluateExpression(expr, getPageContext()))[2]); @@ -159,45 +150,40 @@ } public void testWritableContexts() - throws Exception - { + throws Exception { Object[][] data = writableContextData; - - for(int i = 0; i < data.length; i++) - { + + for(int i = 0; i < data.length; i++) { String expr = (String)data[i][0]; - try - { + try { evaluateUpdateExpression(expr, null, getRequest(), getResponse(), getActionForm(), true); - } - catch(Exception e) - { + } catch(Exception e) { e.printStackTrace(); if(e.getCause() instanceof IllegalExpressionException) continue; } - + throw new ExpressionTestError("The expression \"" + expr + "\" did not throw an exception as expected.", null); } } public void testDirectListUpdate() - throws Exception - { + throws Exception { useForm(COMPLEX_FORM); executeComplexTest("list update", directListUpdate); } - /** Test indexed property updates */ + /** + * Test indexed property updates + */ public void testIndexedUpdate() - throws Exception - { + throws Exception { // array initializations ((SimpleTypeActionForm)getActionForm()).setIntWrapperArrayProperty - (new Integer[] {new Integer(1), new Integer(2), new Integer(3), new Integer(4), new Integer(5)}); - + (new Integer[]{new Integer(1), new Integer(2), new Integer(3), new Integer(4), new Integer(5)}); + executeSimpleTest("indexed update", indexedUpdateData); } @@ -207,69 +193,67 @@ * * ========================================================================== */ - private Object[][] writableContextData = - { - {"{applicationScope.foo}", Boolean.FALSE}, - {"{container.foo}", Boolean.FALSE}, - {"{pageScope.foo}", Boolean.FALSE}, - {"{requestScope.foo}", Boolean.FALSE}, - {"{sessionScope.foo}", Boolean.FALSE}, - {"{param.foo}", Boolean.FALSE}, - }; - - private Object[][] settingComplexTypeData = - { - {"{requestScope.myNewBean}", new SimpleTypeActionForm()}, - {"{sessionScope.anotherBean}", new ComplexTypeActionForm()}, - - {"{actionForm.bigDecimal}", new BigDecimal("1234567890.98273835093245")}, - {"{actionForm.date}", new Date()}, - {"{actionForm.publicBigDecimal}", new BigDecimal("1234567890.98273835093245")}, - {"{actionForm.publicDate}", new Date()}, - - {"{sessionScope.complexBean}", new ComplexTypeActionForm()}, // this must precede the next four tests - - {"{sessionScope.complexBean.bigDecimal}", new BigDecimal("1234567890.98273835093245")}, - {"{sessionScope.complexBean.date}", new Date()}, - {"{sessionScope.complexBean.publicBigDecimal}", new BigDecimal("1234567890.98273835093245")}, - {"{sessionScope.complexBean.publicDate}", new Date()}, - {"{actionForm.array[2].intWrapperProperty}", new Integer(42)}, - {"{actionForm.array[2].intWrapperArrayProperty}", new Integer[] {new Integer(42)}}, - // {"{request.complexBean.array[2].intWrapperArrayProperty}", new Integer(42)} // should this work? - }; - - private Object[][] complexUpdateData = - { - // expr, value, update expr, expected object result, comparator - {"{actionForm.pubMap.bean.shortProperty}", - "4", - new Short((short)4), - new UpdateComparatorAdaptor() - { - public void compareComplex(Object expected, ComplexTypeActionForm complexBean) { - assertEquals(((Short)expected).shortValue(), - ((SimpleTypeActionForm)complexBean.pubMap.get("bean")).getShortProperty()); + private Object[][] writableContextData = + { + {"{applicationScope.foo}", Boolean.FALSE}, + {"{container.foo}", Boolean.FALSE}, + {"{pageScope.foo}", Boolean.FALSE}, + {"{requestScope.foo}", Boolean.FALSE}, + {"{sessionScope.foo}", Boolean.FALSE}, + {"{param.foo}", Boolean.FALSE}, + }; - } - } - }, - {"{actionForm.pubArray[0].shortProperty}", - "7", - new Short((short)7), - new UpdateComparatorAdaptor() - { - public void compareComplex(Object expected, ComplexTypeActionForm complexBean) { - assertEquals(((Short)expected).shortValue(), - ((SimpleTypeActionForm)complexBean.pubArray[0]).getShortProperty()); + private Object[][] settingComplexTypeData = + { + {"{requestScope.myNewBean}", new SimpleTypeActionForm()}, + {"{sessionScope.anotherBean}", new ComplexTypeActionForm()}, - } + {"{actionForm.bigDecimal}", new BigDecimal("1234567890.98273835093245")}, + {"{actionForm.date}", new Date()}, + {"{actionForm.publicBigDecimal}", new BigDecimal("1234567890.98273835093245")}, + {"{actionForm.publicDate}", new Date()}, + + {"{sessionScope.complexBean}", new ComplexTypeActionForm()}, // this must precede the next four tests + + {"{sessionScope.complexBean.bigDecimal}", new BigDecimal("1234567890.98273835093245")}, + {"{sessionScope.complexBean.date}", new Date()}, + {"{sessionScope.complexBean.publicBigDecimal}", new BigDecimal("1234567890.98273835093245")}, + {"{sessionScope.complexBean.publicDate}", new Date()}, + {"{actionForm.array[2].intWrapperProperty}", new Integer(42)}, + {"{actionForm.array[2].intWrapperArrayProperty}", new Integer[]{new Integer(42)}}, + // {"{request.complexBean.array[2].intWrapperArrayProperty}", new Integer(42)} // should this work? + }; + + private Object[][] complexUpdateData = + { + // expr, value, update expr, expected object result, comparator + {"{actionForm.pubMap.bean.shortProperty}", + "4", + new Short((short)4), + new UpdateComparatorAdaptor() { + public void compareComplex(Object expected, ComplexTypeActionForm complexBean) { + assertEquals(((Short)expected).shortValue(), + ((SimpleTypeActionForm)complexBean.pubMap.get("bean")).getShortProperty()); + + } + } + }, + {"{actionForm.pubArray[0].shortProperty}", + "7", + new Short((short)7), + new UpdateComparatorAdaptor() { + public void compareComplex(Object expected, ComplexTypeActionForm complexBean) { + assertEquals(((Short)expected).shortValue(), + ((SimpleTypeActionForm)complexBean.pubArray[0]).getShortProperty()); + + } + } } - } - }; + }; // expression, string update value, Object expected value, comparator - private Object[][] primitiveUpdateData = - { + private Object[][] primitiveUpdateData = + { // // this test will fail and is used to make sure the harness is running correctly // {"{actionForm.intProperty}", "1234321", new Integer(1234), new UpdateComparatorAdaptor() // { @@ -279,117 +263,102 @@ // } // } // }, - {"{actionForm.boolProperty}", "true", Boolean.TRUE, new UpdateComparatorAdaptor() - { + {"{actionForm.boolProperty}", "true", Boolean.TRUE, new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - assertEquals(actualBean.getBoolProperty(), - ((Boolean)expected).booleanValue()); + assertEquals(actualBean.getBoolProperty(), + ((Boolean)expected).booleanValue()); } }}, - {"{actionForm.boolProperty}", "", Boolean.FALSE, new UpdateComparatorAdaptor() - { + {"{actionForm.boolProperty}", "", Boolean.FALSE, new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - assertEquals(actualBean.getBoolProperty(), - ((Boolean)expected).booleanValue()); + assertEquals(actualBean.getBoolProperty(), + ((Boolean)expected).booleanValue()); } } - }, - {"{actionForm.byteProperty}", "8", new Byte("8"), new UpdateComparatorAdaptor() - { + }, + {"{actionForm.byteProperty}", "8", new Byte("8"), new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - assertEquals(actualBean.getByteProperty(), - ((Byte)expected).byteValue()); + assertEquals(actualBean.getByteProperty(), + ((Byte)expected).byteValue()); } } - }, - {"{actionForm.byteProperty}", "", new Byte("0"), new UpdateComparatorAdaptor() - { + }, + {"{actionForm.byteProperty}", "", new Byte("0"), new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - assertEquals(actualBean.getByteProperty(), - ((Byte)expected).byteValue()); + assertEquals(actualBean.getByteProperty(), + ((Byte)expected).byteValue()); } } - }, - {"{actionForm.charProperty}", "Z", new Character('Z'), new UpdateComparatorAdaptor() - { + }, + {"{actionForm.charProperty}", "Z", new Character('Z'), new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { assertEquals(actualBean.getCharProperty(), ((Character)expected).charValue()); } }, - }, - {"{actionForm.charProperty}", "", new Character('\u0000'), new UpdateComparatorAdaptor() - { + }, + {"{actionForm.charProperty}", "", new Character('\u0000'), new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { assertEquals(actualBean.getCharProperty(), ((Character)expected).charValue()); } }, - }, - {"{actionForm.doubleProperty}", "3.1415", new Double(3.1415), new UpdateComparatorAdaptor() - { + }, + {"{actionForm.doubleProperty}", "3.1415", new Double(3.1415), new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - AssertHelper.assertEquals(actualBean.getDoubleProperty(), - ((Double)expected).doubleValue()); + AssertHelper.assertEquals(actualBean.getDoubleProperty(), + ((Double)expected).doubleValue()); } } - }, - {"{actionForm.doubleProperty}", "", new Double(0.0), new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { - AssertHelper.assertEquals(actualBean.getDoubleProperty(), - ((Double)expected).doubleValue()); + }, + {"{actionForm.doubleProperty}", "", new Double(0.0), new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals(actualBean.getDoubleProperty(), + ((Double)expected).doubleValue()); } } - }, - {"{actionForm.floatProperty}", "3.1415f", new Float(3.1415), new UpdateComparatorAdaptor() - { + }, + {"{actionForm.floatProperty}", "3.1415f", new Float(3.1415), new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - AssertHelper.assertEquals(actualBean.getFloatProperty(), - ((Float)expected).floatValue()); + AssertHelper.assertEquals(actualBean.getFloatProperty(), + ((Float)expected).floatValue()); } } - }, - {"{actionForm.floatProperty}", "", new Float(0.0), new UpdateComparatorAdaptor() - { + }, + {"{actionForm.floatProperty}", "", new Float(0.0), new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - AssertHelper.assertEquals(actualBean.getFloatProperty(), - ((Float)expected).floatValue()); + AssertHelper.assertEquals(actualBean.getFloatProperty(), + ((Float)expected).floatValue()); } } - }, - {"{actionForm.intProperty}", "1234321", new Integer(1234321), new UpdateComparatorAdaptor() - { + }, + {"{actionForm.intProperty}", "1234321", new Integer(1234321), new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - assertEquals(actualBean.getIntProperty(), - ((Integer)expected).intValue()); + assertEquals(actualBean.getIntProperty(), + ((Integer)expected).intValue()); } } - }, - {"{actionForm.intProperty}", "1234321 ", new Integer(1234321), new UpdateComparatorAdaptor() - { + }, + {"{actionForm.intProperty}", "1234321 ", new Integer(1234321), new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - assertEquals(actualBean.getIntProperty(), - ((Integer)expected).intValue()); + assertEquals(actualBean.getIntProperty(), + ((Integer)expected).intValue()); } } - }, - {"{actionForm.intProperty}", " 1234321 ", new Integer(1234321), new UpdateComparatorAdaptor() - { + }, + {"{actionForm.intProperty}", " 1234321 ", new Integer(1234321), new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - assertEquals(actualBean.getIntProperty(), - ((Integer)expected).intValue()); + assertEquals(actualBean.getIntProperty(), + ((Integer)expected).intValue()); } } - }, - {"{actionForm.intProperty}", " 1234321 ", new Integer(1234321), new UpdateComparatorAdaptor() - { + }, + {"{actionForm.intProperty}", " 1234321 ", new Integer(1234321), new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - assertEquals(actualBean.getIntProperty(), - ((Integer)expected).intValue()); + assertEquals(actualBean.getIntProperty(), + ((Integer)expected).intValue()); } } - }, - // @todo: this fails + }, + // @todo: this fails // {"{actionForm.intProperty}", " ", new Integer(0), new UpdateComparatorAdaptor() // { // public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { @@ -420,22 +389,20 @@ // } // } // }, - {"{actionForm.intProperty}", "", new Integer(0), new UpdateComparatorAdaptor() - { + {"{actionForm.intProperty}", "", new Integer(0), new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - assertEquals(actualBean.getIntProperty(), - ((Integer)expected).intValue()); + assertEquals(actualBean.getIntProperty(), + ((Integer)expected).intValue()); } } - }, - {"{actionForm.intProperty}", null, new Integer(0), new UpdateComparatorAdaptor() - { + }, + {"{actionForm.intProperty}", null, new Integer(0), new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { assertEquals(actualBean.getIntProperty(), ((Integer)expected).intValue()); } } - }, - // this test fails on jRockit because of precision differences in how the VMs execute + }, + // this test fails on jRockit because of precision differences in how the VMs execute // {"{actionForm.longProperty}", "12345678987654321L", new Long(12345678987654321L), new UpdateComparatorAdaptor() // { // public void compareSimple(Object expected, SimpleTypeActionForm actualBean) @@ -445,172 +412,153 @@ // } // } // }, - {"{actionForm.longProperty}", "", new Long(0L), new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { - assertEquals(actualBean.getLongProperty(), - ((Long)expected).longValue()); - } - } - }, - {"{actionForm.shortProperty}", "32766", new Short((short)32766), new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { - assertEquals(actualBean.getShortProperty(), - ((Short)expected).shortValue()); - } - } - }, - {"{actionForm.shortProperty}", "", new Short((short)0), new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { - assertEquals(actualBean.getShortProperty(), - ((Short)expected).shortValue()); + {"{actionForm.longProperty}", "", new Long(0L), new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + assertEquals(actualBean.getLongProperty(), + ((Long)expected).longValue()); } } - } - }; - - private Object[][] primitiveWrapperUpdateData = - { - {"{actionForm.stringProperty}", "aNewStringProperty", "aNewStringProperty", new UpdateComparatorAdaptor() - { + }, + {"{actionForm.shortProperty}", "32766", new Short((short)32766), new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + assertEquals(actualBean.getShortProperty(), + ((Short)expected).shortValue()); + } + } + }, + {"{actionForm.shortProperty}", "", new Short((short)0), new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + assertEquals(actualBean.getShortProperty(), + ((Short)expected).shortValue()); + } + } + } + }; + + private Object[][] primitiveWrapperUpdateData = + { + {"{actionForm.stringProperty}", "aNewStringProperty", "aNewStringProperty", new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { assertEquals(actualBean.getStringProperty(), expected); } } - }, - {"{actionForm.stringProperty}", "", "", new UpdateComparatorAdaptor() - { + }, + {"{actionForm.stringProperty}", "", "", new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { assertEquals(actualBean.getStringProperty(), expected); } } - }, - {"{actionForm.stringProperty}", null, null, new UpdateComparatorAdaptor() - { + }, + {"{actionForm.stringProperty}", null, null, new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { assertNull(actualBean.getStringProperty()); } } - }, - {"{actionForm.booleanWrapperProperty}", "true", Boolean.TRUE, new UpdateComparatorAdaptor() - { + }, + {"{actionForm.booleanWrapperProperty}", "true", Boolean.TRUE, new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - assertEquals(actualBean.getBooleanWrapperProperty().booleanValue(), - ((Boolean)expected).booleanValue()); + assertEquals(actualBean.getBooleanWrapperProperty().booleanValue(), + ((Boolean)expected).booleanValue()); } } - }, - {"{actionForm.booleanWrapperProperty}", "false", Boolean.FALSE, new UpdateComparatorAdaptor() - { + }, + {"{actionForm.booleanWrapperProperty}", "false", Boolean.FALSE, new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - assertEquals(actualBean.getBooleanWrapperProperty().booleanValue(), - ((Boolean)expected).booleanValue()); + assertEquals(actualBean.getBooleanWrapperProperty().booleanValue(), + ((Boolean)expected).booleanValue()); } } - }, - {"{actionForm.booleanWrapperProperty}", "", null, new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { + }, + {"{actionForm.booleanWrapperProperty}", "", null, new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { if(expected.equals("") && actualBean.getBooleanWrapperProperty() == null) return; - else throw new AssertionFailedError("Expected null but found " + actualBean.getBooleanWrapperProperty()); + else + throw new AssertionFailedError("Expected null but found " + actualBean.getBooleanWrapperProperty()); } } - }, - {"{actionForm.byteWrapperProperty}", "8", new Byte("8"), new UpdateComparatorAdaptor() - { + }, + {"{actionForm.byteWrapperProperty}", "8", new Byte("8"), new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - assertEquals(actualBean.getByteWrapperProperty().byteValue(), - ((Byte)expected).byteValue()); + assertEquals(actualBean.getByteWrapperProperty().byteValue(), + ((Byte)expected).byteValue()); } } - }, - {"{actionForm.byteWrapperProperty}", "", null, new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { + }, + {"{actionForm.byteWrapperProperty}", "", null, new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { if(expected.equals("") && actualBean.getByteWrapperProperty() == null) return; - else throw new AssertionFailedError("Expected null but found " + actualBean.getByteWrapperProperty()); + else + throw new AssertionFailedError("Expected null but found " + actualBean.getByteWrapperProperty()); } } - }, - {"{actionForm.charWrapperProperty}", "Z", new Character('Z'), new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { - assertEquals(actualBean.getCharWrapperProperty().charValue(), - ((Character)expected).charValue()); + }, + {"{actionForm.charWrapperProperty}", "Z", new Character('Z'), new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + assertEquals(actualBean.getCharWrapperProperty().charValue(), + ((Character)expected).charValue()); } } - }, - {"{actionForm.charWrapperProperty}", "", null, new UpdateComparatorAdaptor() - { + }, + {"{actionForm.charWrapperProperty}", "", null, new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { if(expected.equals("") && actualBean.getCharWrapperProperty() == null) return; - else throw new AssertionFailedError("Expected null but found " + actualBean.getCharWrapperProperty()); + else + throw new AssertionFailedError("Expected null but found " + actualBean.getCharWrapperProperty()); } } - }, - {"{actionForm.doubleWrapperProperty}", "3.1415", new Double(3.1415), new UpdateComparatorAdaptor() - { + }, + {"{actionForm.doubleWrapperProperty}", "3.1415", new Double(3.1415), new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - AssertHelper.assertEquals(actualBean.getDoubleWrapperProperty().doubleValue(), - ((Double)expected).doubleValue()); + AssertHelper.assertEquals(actualBean.getDoubleWrapperProperty().doubleValue(), + ((Double)expected).doubleValue()); } } - }, - {"{actionForm.doubleWrapperProperty}", "", null, new UpdateComparatorAdaptor() - { + }, + {"{actionForm.doubleWrapperProperty}", "", null, new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { if(expected.equals("") && actualBean.getDoubleWrapperProperty() == null) return; - else throw new AssertionFailedError("Expected null but found " + actualBean.getDoubleWrapperProperty()); + else + throw new AssertionFailedError("Expected null but found " + actualBean.getDoubleWrapperProperty()); } } - }, - {"{actionForm.floatWrapperProperty}", "3.1415f", new Float(3.1415), new UpdateComparatorAdaptor() - { + }, + {"{actionForm.floatWrapperProperty}", "3.1415f", new Float(3.1415), new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - AssertHelper.assertEquals(actualBean.getFloatWrapperProperty().floatValue(), - ((Float)expected).floatValue()); + AssertHelper.assertEquals(actualBean.getFloatWrapperProperty().floatValue(), + ((Float)expected).floatValue()); } } - }, - {"{actionForm.floatWrapperProperty}", "", null, new UpdateComparatorAdaptor() - { + }, + {"{actionForm.floatWrapperProperty}", "", null, new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { if(expected.equals("") && actualBean.getFloatWrapperProperty() == null) return; - else throw new AssertionFailedError("Expected null but found " + actualBean.getFloatWrapperProperty()); + else + throw new AssertionFailedError("Expected null but found " + actualBean.getFloatWrapperProperty()); } } - }, - {"{actionForm.intWrapperProperty}", "1234321", new Integer(1234321), new UpdateComparatorAdaptor() - { + }, + {"{actionForm.intWrapperProperty}", "1234321", new Integer(1234321), new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - assertEquals(actualBean.getIntWrapperProperty().intValue(), - ((Integer)expected).intValue()); + assertEquals(actualBean.getIntWrapperProperty().intValue(), + ((Integer)expected).intValue()); } } - }, - {"{actionForm.intWrapperProperty}", "", null, new UpdateComparatorAdaptor() - { + }, + {"{actionForm.intWrapperProperty}", "", null, new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { if(expected.equals("") && actualBean.getIntWrapperProperty() == null) return; - else throw new AssertionFailedError("Expected null but found " + actualBean.getIntWrapperProperty()); + else + throw new AssertionFailedError("Expected null but found " + actualBean.getIntWrapperProperty()); } } - }, - // this test fails on jRockit because of precision differences in how the VMs execute + }, + // this test fails on jRockit because of precision differences in how the VMs execute // {"{actionForm.longWrapperProperty}", "12345678987654321L", new Long(12345678987654321L), new UpdateComparatorAdaptor() // { // public void compareSimple(Object expected, SimpleTypeActionForm actualBean) @@ -620,385 +568,337 @@ // } // } // }, - {"{actionForm.longWrapperProperty}", "", null, new UpdateComparatorAdaptor() - { + {"{actionForm.longWrapperProperty}", "", null, new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { if(expected.equals("") && actualBean.getLongWrapperProperty() == null) return; - else throw new AssertionFailedError("Expected null but found " + actualBean.getLongWrapperProperty()); + else + throw new AssertionFailedError("Expected null but found " + actualBean.getLongWrapperProperty()); } } - }, - {"{actionForm.shortWrapperProperty}", "32766", new Short((short)32766), new UpdateComparatorAdaptor() - { + }, + {"{actionForm.shortWrapperProperty}", "32766", new Short((short)32766), new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - assertEquals(actualBean.getShortWrapperProperty().shortValue(), - ((Short)expected).shortValue()); + assertEquals(actualBean.getShortWrapperProperty().shortValue(), + ((Short)expected).shortValue()); } } - }, - {"{actionForm.shortWrapperProperty}", "", null, new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { + }, + {"{actionForm.shortWrapperProperty}", "", null, new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { if(expected.equals("") && actualBean.getShortWrapperProperty() == null) return; - else throw new AssertionFailedError("Expected null but found " + actualBean.getShortWrapperProperty()); + else + throw new AssertionFailedError("Expected null but found " + actualBean.getShortWrapperProperty()); } } - } - }; + } + }; + + private Object[][] arrayUpdateData = + { + {"{actionForm.stringArrayProperty}", + new String[]{"One", "Two", "Three", "Four", "Five"}, + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, actualBean.getStringArrayProperty()); + } + } + }, + {"{actionForm.stringArrayProperty}", + new String[0], + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, actualBean.getStringArrayProperty()); + } + } + }, + {"{actionForm.stringArrayProperty}", + null, + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + assertNull(actualBean.getStringArrayProperty()); + } + } + }, + {"{actionForm.stringArrayProperty}", + new String[]{""}, + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, ((SimpleTypeActionForm)getActionForm()).getStringArrayProperty()); + } + } + }, + {"{actionForm.stringArrayProperty}", + "singleString", + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + assertEquals("singleString", ((SimpleTypeActionForm)getActionForm()).getStringArrayProperty()[0]); + } + } + }, + // expression, update values, compare values, + {"{actionForm.boolArrayProperty}", + new String[]{"true", "false", "false", "true"}, + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, actualBean.getBoolArrayProperty()); + } + } + }, + {"{actionForm.boolArrayProperty}", + EMPTY_ARRAY, + new String[]{"false", "false", "false"}, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, actualBean.getBoolArrayProperty()); + } + } + }, + {"{actionForm.byteArrayProperty}", + new String[]{"-5", "-4", "-3", "-2", "-1", "0", "1", "2", "3", "4", "5"}, + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, actualBean.getByteArrayProperty()); + } + } + }, + {"{actionForm.byteArrayProperty}", + EMPTY_ARRAY, + new String[]{"0", "0", "0"}, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, actualBean.getByteArrayProperty()); + } + } + }, + {"{actionForm.charArrayProperty}", + new String[]{"a", "b", "c", "d"}, + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, actualBean.getCharArrayProperty()); + } + } + }, + {"{actionForm.doubleArrayProperty}", + new String[]{"3.1415", "2.718281828"}, + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, actualBean.getDoubleArrayProperty()); + } + } + }, + {"{actionForm.floatArrayProperty}", + new String[]{"3.1415", "2.718281828"}, + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, actualBean.getFloatArrayProperty()); + } + } + }, + {"{actionForm.floatArrayProperty}", + // the f's in the below make a big difference in JavaScript; they're not supported. :) + new String[]{"3.1415f", "2.718281828f"}, + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, actualBean.getFloatArrayProperty()); + } + } + }, + {"{actionForm.intArrayProperty}", + new String[]{"123", "456", "789"}, + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, actualBean.getIntArrayProperty()); + } + } + }, + {"{actionForm.intArrayProperty}", + null, + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + assertNull(actualBean.getIntArrayProperty()); + } + } + }, + {"{actionForm.longArrayProperty}", + new String[]{"-5", "-4", "-3", "-2", "-1", "0", "1", "2", "3", "4", "5"}, + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, actualBean.getLongArrayProperty()); + } + } + }, + {"{actionForm.shortArrayProperty}", + new String[]{"-5", "-4", "-3", "-2", "-1", "0", "1", "2", "3", "4", "5"}, + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, actualBean.getShortArrayProperty()); + } + } + }, - private Object[][] arrayUpdateData = - { - {"{actionForm.stringArrayProperty}", - new String[] {"One", "Two", "Three", "Four", "Five"}, - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { - AssertHelper.assertEquals((String[])expected, actualBean.getStringArrayProperty()); - } - } - }, - {"{actionForm.stringArrayProperty}", - new String[0], - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { - AssertHelper.assertEquals((String[])expected, actualBean.getStringArrayProperty()); - } - } - }, - {"{actionForm.stringArrayProperty}", - null, - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { - assertNull(actualBean.getStringArrayProperty()); - } - } - }, - {"{actionForm.stringArrayProperty}", - new String[] {""}, - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { - AssertHelper.assertEquals((String[])expected, ((SimpleTypeActionForm)getActionForm()).getStringArrayProperty()); - } - } - }, - {"{actionForm.stringArrayProperty}", - "singleString", - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { - assertEquals("singleString", ((SimpleTypeActionForm)getActionForm()).getStringArrayProperty()[0]); - } - } - }, - // expression, update values, compare values, - {"{actionForm.boolArrayProperty}", - new String[] {"true", "false", "false", "true"}, - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { - AssertHelper.assertEquals((String[])expected, actualBean.getBoolArrayProperty()); - } - } - }, - {"{actionForm.boolArrayProperty}", - EMPTY_ARRAY, - new String[] {"false", "false", "false"}, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - AssertHelper.assertEquals((String[])expected, actualBean.getBoolArrayProperty()); - } - } - }, - {"{actionForm.byteArrayProperty}", - new String[] {"-5", "-4", "-3", "-2", "-1", "0", "1", "2", "3", "4", "5"}, - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { - AssertHelper.assertEquals((String[])expected, actualBean.getByteArrayProperty()); - } - } - }, - {"{actionForm.byteArrayProperty}", - EMPTY_ARRAY, - new String[] {"0", "0", "0"}, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { - AssertHelper.assertEquals((String[])expected, actualBean.getByteArrayProperty()); - } - } - }, - {"{actionForm.charArrayProperty}", - new String[] {"a", "b", "c", "d"}, - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - AssertHelper.assertEquals((String[])expected, actualBean.getCharArrayProperty()); - } - } - }, - {"{actionForm.doubleArrayProperty}", - new String[] {"3.1415", "2.718281828"}, - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - AssertHelper.assertEquals((String[])expected, actualBean.getDoubleArrayProperty()); - } - } - }, - {"{actionForm.floatArrayProperty}", - new String[] {"3.1415", "2.718281828"}, - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { - AssertHelper.assertEquals((String[])expected, actualBean.getFloatArrayProperty()); - } - } - }, - {"{actionForm.floatArrayProperty}", - // the f's in the below make a big difference in JavaScript; they're not supported. :) - new String [] {"3.1415f", "2.718281828f"}, - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { - AssertHelper.assertEquals((String[])expected, actualBean.getFloatArrayProperty()); - } - } - }, - {"{actionForm.intArrayProperty}", - new String[] {"123", "456", "789"}, - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - AssertHelper.assertEquals((String[])expected, actualBean.getIntArrayProperty()); - } - } - }, - {"{actionForm.intArrayProperty}", - null, - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - assertNull(actualBean.getIntArrayProperty()); - } - } - }, - {"{actionForm.longArrayProperty}", - new String[] {"-5", "-4", "-3", "-2", "-1", "0", "1", "2", "3", "4", "5"}, - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { - AssertHelper.assertEquals((String[])expected, actualBean.getLongArrayProperty()); - } - } - }, - {"{actionForm.shortArrayProperty}", - new String[] {"-5", "-4", "-3", "-2", "-1", "0", "1", "2", "3", "4", "5"}, - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - AssertHelper.assertEquals((String[])expected, actualBean.getShortArrayProperty()); - } - } - }, - - // - // Primitive Wrapper Type Array updates - // - - // expression, update values, compare values, - {"{actionForm.boolWrapperArrayProperty}", - new String[] {"true", "false", "false", "true"}, - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - AssertHelper.assertEquals((String[])expected, actualBean.getBoolWrapperArrayProperty()); - } - } - }, - {"{actionForm.boolWrapperArrayProperty}", - EMPTY_ARRAY, - new String[] {null, null, null}, - new UpdateComparatorAdaptor() - { + // + // Primitive Wrapper Type Array updates + // + + // expression, update values, compare values, + {"{actionForm.boolWrapperArrayProperty}", + new String[]{"true", "false", "false", "true"}, + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, actualBean.getBoolWrapperArrayProperty()); + } + } + }, + {"{actionForm.boolWrapperArrayProperty}", + EMPTY_ARRAY, + new String[]{null, null, null}, + new UpdateComparatorAdaptor() { public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { AssertHelper.assertEquals((String[])expected, actualBean.getBoolWrapperArrayProperty()); } } - }, - {"{actionForm.byteWrapperArrayProperty}", - new String[] {"-5", "-4", "-3", "-2", "-1", "0", "1", "2", "3", "4", "5"}, - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { - AssertHelper.assertEquals((String[])expected, actualBean.getByteWrapperArrayProperty()); - } - } - }, - {"{actionForm.byteWrapperArrayProperty}", - EMPTY_ARRAY, - new String[] {null, null, null}, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { - AssertHelper.assertEquals((String[])expected, actualBean.getByteWrapperArrayProperty()); - } - } - }, - {"{actionForm.charWrapperArrayProperty}", - new String[] {"a", "b", "c", "d"}, - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - AssertHelper.assertEquals((String[])expected, actualBean.getCharWrapperArrayProperty()); - } - } - }, - {"{actionForm.doubleWrapperArrayProperty}", - new String[] {"3.1415", "2.718281828"}, - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - AssertHelper.assertEquals((String[])expected, actualBean.getDoubleWrapperArrayProperty()); - } - } - }, - {"{actionForm.floatWrapperArrayProperty}", - new String[] {"3.1415", "2.718281828"}, - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { - AssertHelper.assertEquals((String[])expected, actualBean.getFloatWrapperArrayProperty()); - } - } - }, - {"{actionForm.floatWrapperArrayProperty}", - // the f's in the below make a big difference in JavaScript; they're not supported. :) - new String [] {"3.1415f", "2.718281828f"}, - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { - AssertHelper.assertEquals((String[])expected, actualBean.getFloatWrapperArrayProperty()); - } - } - }, - {"{actionForm.intWrapperArrayProperty}", - new String[] {"123", "456", "789"}, - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - AssertHelper.assertEquals((String[])expected, actualBean.getIntWrapperArrayProperty()); - } - } - }, - {"{actionForm.longWrapperArrayProperty}", - new String[] {"-5", "-4", "-3", "-2", "-1", "0", "1", "2", "3", "4", "5"}, - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { - AssertHelper.assertEquals((String[])expected, actualBean.getLongWrapperArrayProperty()); - } - } - }, - {"{actionForm.shortWrapperArrayProperty}", - new String[] {"-5", "-4", "-3", "-2", "-1", "0", "1", "2", "3", "4", "5"}, - null, - new UpdateComparatorAdaptor() - { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { - AssertHelper.assertEquals((String[])expected, actualBean.getShortWrapperArrayProperty()); + }, + {"{actionForm.byteWrapperArrayProperty}", + new String[]{"-5", "-4", "-3", "-2", "-1", "0", "1", "2", "3", "4", "5"}, + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, actualBean.getByteWrapperArrayProperty()); + } } - } - } - }; - - Object[][] indexedUpdateData = - { - {"{actionForm.intWrapperArrayProperty[4]}", - new Integer(123), - null, - new UpdateComparatorAdaptor() { - public void compareSimple(Object expected, SimpleTypeActionForm actualBean) - { - if(123 == actualBean.getIntWrapperArrayProperty()[4].intValue()) - return; - else throw new RuntimeException - ("Error testing indexed updates; received value \"" + actualBean.getIntWrapperArrayProperty()[4] + "\"; expected value 123", null); - } - } - }, - }; - - Object[][] directListUpdate = - { - {"{actionForm.list}", - new String[] {"foo", "bar", "baz", "blee"}, - null, - new UpdateComparatorAdaptor() - { - public void compareComplex(Object expected, ComplexTypeActionForm actualBean) - { - List list = actualBean.getList(); + }, + {"{actionForm.byteWrapperArrayProperty}", + EMPTY_ARRAY, + new String[]{null, null, null}, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, actualBean.getByteWrapperArrayProperty()); + } + } + }, + {"{actionForm.charWrapperArrayProperty}", + new String[]{"a", "b", "c", "d"}, + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, actualBean.getCharWrapperArrayProperty()); + } + } + }, + {"{actionForm.doubleWrapperArrayProperty}", + new String[]{"3.1415", "2.718281828"}, + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, actualBean.getDoubleWrapperArrayProperty()); + } + } + }, + {"{actionForm.floatWrapperArrayProperty}", + new String[]{"3.1415", "2.718281828"}, + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, actualBean.getFloatWrapperArrayProperty()); + } + } + }, + {"{actionForm.floatWrapperArrayProperty}", + // the f's in the below make a big difference in JavaScript; they're not supported. :) + new String[]{"3.1415f", "2.718281828f"}, + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, actualBean.getFloatWrapperArrayProperty()); + } + } + }, + {"{actionForm.intWrapperArrayProperty}", + new String[]{"123", "456", "789"}, + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, actualBean.getIntWrapperArrayProperty()); + } + } + }, + {"{actionForm.longWrapperArrayProperty}", + new String[]{"-5", "-4", "-3", "-2", "-1", "0", "1", "2", "3", "4", "5"}, + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, actualBean.getLongWrapperArrayProperty()); + } + } + }, + {"{actionForm.shortWrapperArrayProperty}", + new String[]{"-5", "-4", "-3", "-2", "-1", "0", "1", "2", "3", "4", "5"}, + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + AssertHelper.assertEquals((String[])expected, actualBean.getShortWrapperArrayProperty()); + } + } + } + }; + + Object[][] indexedUpdateData = + { + {"{actionForm.intWrapperArrayProperty[4]}", + new Integer(123), + null, + new UpdateComparatorAdaptor() { + public void compareSimple(Object expected, SimpleTypeActionForm actualBean) { + if(123 == actualBean.getIntWrapperArrayProperty()[4].intValue()) + return; + else + throw new RuntimeException + ("Error testing indexed updates; received value \"" + actualBean.getIntWrapperArrayProperty()[4] + "\"; expected value 123", null); + } + } + }, + }; + + Object[][] directListUpdate = + { + {"{actionForm.list}", + new String[]{"foo", "bar", "baz", "blee"}, + null, + new UpdateComparatorAdaptor() { + public void compareComplex(Object expected, ComplexTypeActionForm actualBean) { + List list = actualBean.getList(); // System.out.println("list: " + list); // for(int i = 0; i < list.size(); i++) // { // System.out.println("list[" + i + "]: " + list.get(i)); // } - - assertEquals("foo", list.get(list.size()-4)); - assertEquals("bar", list.get(list.size()-3)); - assertEquals("baz", list.get(list.size()-2)); - assertEquals("blee", list.get(list.size()-1)); + + assertEquals("foo", list.get(list.size() - 4)); + assertEquals("bar", list.get(list.size() - 3)); + assertEquals("baz", list.get(list.size() - 2)); + assertEquals("blee", list.get(list.size() - 1)); + } } - } - } - }; + } + }; /* =============================================================== * @@ -1007,10 +907,8 @@ * =============================================================== */ private void executeSimpleTest(String testName, Object[][] data) - throws ExpressionTestError - { - for(int i = 0; i < data.length; i++) - { + throws ExpressionTestError { + for(int i = 0; i < data.length; i++) { String expr = (String)data[i][0]; Object updateData = data[i][1]; Object updatedValue = (data[i][2] == null ? updateData : data[i][2]); @@ -1020,69 +918,64 @@ ServletRequest request = getPageContext().getRequest(); ServletResponse response = getPageContext().getResponse(); - try - { + try { evaluateUpdateExpression(expr, updateData, request, response, getActionForm()); - + SimpleTypeActionForm simpleBean = (SimpleTypeActionForm)getActionForm(); comparator.compareSimple(updatedValue, simpleBean); - } - catch(Throwable e) - { + } catch(Throwable e) { throw new ExpressionTestError("An error occurred executing " + testName + " [" + i + "] with expression '" + expr + "'", e); } } } private void executeComplexTest(String testName, Object[][] data) - throws Exception - { + throws Exception { useForm(COMPLEX_FORM); - for(int i = 0; i < data.length; i++) - { + for(int i = 0; i < data.length; i++) { String expr = (String)data[i][0]; Object value = data[i][1]; Object expected = data[i][2]; UpdateComparator comparator = (UpdateComparator)data[i][3]; - try - { + try { evaluateUpdateExpression(expr, value, getRequest(), getResponse(), getActionForm()); ComplexTypeActionForm complexBean = (ComplexTypeActionForm)getRequest().getAttribute("complexBean"); comparator.compareComplex(expected, complexBean); - } - catch(Throwable t) - { + } catch(Throwable t) { throw new ExpressionTestError("An error occurred executing " + testName + " [" + i + "] with expression '" + expr + "'", t); } } } - public ExpressionUpdateTest(String name) - { + public ExpressionUpdateTest(String name) { super(name); } /** * A protected interface that allows the result of an expression update to be compared - * against an expected value. This facilitates a cleaner and more extensible test + * against an expected value. This facilitates a cleaner and more extensible test * framework as there doesn't have to be code for each type of test. A comparison * can be made simply by implementing this interface. */ - protected interface UpdateComparator - { + protected interface UpdateComparator { + public void compareSimple(Object expected, SimpleTypeActionForm simpleBean); + public void compareComplex(Object expected, ComplexTypeActionForm complexBean); } protected static class UpdateComparatorAdaptor - implements UpdateComparator - { - public void compareSimple(Object expected, SimpleTypeActionForm simpleBean){} - public void compareComplex(Object expected, ComplexTypeActionForm complexBean){} + implements UpdateComparator { + + public void compareSimple(Object expected, SimpleTypeActionForm simpleBean) { + } + + public void compareComplex(Object expected, ComplexTypeActionForm complexBean) { + } } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/PageInputTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/PageInputTest.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/PageInputTest.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/PageInputTest.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/PageInputTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/PageInputTest.java Wed Jan 19 11:00:31 2005 @@ -26,13 +26,12 @@ * */ public abstract class PageInputTest - extends AbstractExpressionTest -{ + extends AbstractExpressionTest { + public void testPageInputs() - throws Exception - { + throws Exception { ServletRequest request = getPageContext().getRequest(); - + String value = "This is a Page Input!"; PageFlowUtils.addPageInput("test", value, request); @@ -41,10 +40,9 @@ Object result = evaluateExpression("{pageInput.test}", getPageContext()); assert result.equals(value); } - + public void testActionOutputs() - throws Exception - { + throws Exception { ServletRequest request = getPageContext().getRequest(); String value = "This is a Page Input!"; @@ -57,8 +55,7 @@ assert result.equals(value); } - public PageInputTest(String name) - { + public PageInputTest(String name) { super(name); } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java Wed Jan 19 11:00:31 2005 @@ -20,6 +20,7 @@ // java imports // internal imports + import org.apache.beehive.netui.script.Expression; // external imports @@ -28,43 +29,38 @@ * Unit tests for XScript expression parsing. */ public abstract class ParsedExpressionTest - extends AbstractExpressionTest -{ - private Object[][] _data = - { - {"{pageScope.foo}", "pageScope"}, - {"{pageFlow}", "pageFlow"}, - {"{actionForm[42]}", "actionForm"}, - {"{actionForm[\"42\"]}", "actionForm"}, - {"{actionForm[\"42\"]", null}, - {"nonExpressionText", null}, - }; - - public void testParsedExpression() - { - for(int i = 0; i < _data.length; i++) + extends AbstractExpressionTest { + + private Object[][] _data = { + {"{pageScope.foo}", "pageScope"}, + {"{pageFlow}", "pageFlow"}, + {"{actionForm[42]}", "actionForm"}, + {"{actionForm[\"42\"]}", "actionForm"}, + {"{actionForm[\"42\"]", null}, + {"nonExpressionText", null}, + }; + + public void testParsedExpression() { + for(int i = 0; i < _data.length; i++) { String expr = (String)_data[i][0]; String context = (String)_data[i][1]; - - try - { + + try { Expression act = getExpressionEvaluator().parseExpression(expr); - - assertEquals("ParsedExpression context failed on test case [" + i + "] with expression \"" + expr + "\" context is \"" + context + "\"", - context, act.getContext()); - } - catch(Throwable t) - { + + assertEquals("ParsedExpression context failed on test case [" + i + "] with expression \"" + expr + "\" context is \"" + context + "\"", + context, act.getContext()); + } catch(Throwable t) { if(context == null) continue; - else throw new RuntimeException("ParsedExpression context test failed in test case [" + i + "]. Cause: " + t); + else + throw new RuntimeException("ParsedExpression context test failed in test case [" + i + "]. Cause: " + t); } } } - public ParsedExpressionTest(String name) - { + public ParsedExpressionTest(String name) { super(name); } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ProcessPopulateTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ProcessPopulateTest.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ProcessPopulateTest.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ProcessPopulateTest.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ProcessPopulateTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ProcessPopulateTest.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.test.script; // java imports + import java.lang.reflect.Proxy; import javax.servlet.ServletRequest; @@ -45,27 +46,25 @@ * */ public class ProcessPopulateTest - extends TestCase -{ + extends TestCase { + private ServletRequest _fauxRequest = null; private ServletResponse _fauxResponse = null; private SimpleTypeActionForm _simpleActionForm = null; - + public static class HelloWorldPrefixHandler - implements RequestParameterHandler - { - public void process(HttpServletRequest request, String key, String expr, ProcessPopulate.ExpressionUpdateNode node) - { + implements RequestParameterHandler { + + public void process(HttpServletRequest request, String key, String expr, ProcessPopulate.ExpressionUpdateNode node) { String[] ary = {"hello world!"}; node.values = ary; } } public void testParameterHandling() - throws Exception - { + throws Exception { ProcessPopulate.registerPrefixHandler("foo", new HelloWorldPrefixHandler()); - + HttpServletRequestHandler reqHandler = (HttpServletRequestHandler)Proxy.getInvocationHandler(_fauxRequest); reqHandler.addParam("wlw-foo:{actionForm.stringProperty}", "some new value"); @@ -77,8 +76,7 @@ assertEquals("hello world!", ((SimpleTypeActionForm)_fauxRequest.getAttribute("simpleBean")).getStringProperty()); } - protected void setUp() - { + protected void setUp() { _simpleActionForm = new SimpleTypeActionForm(); _fauxRequest = ServletFactory.getServletRequest(); @@ -88,18 +86,15 @@ _fauxResponse = ServletFactory.getServletResponse(); } - public ProcessPopulateTest(String name) - { + public ProcessPopulateTest(String name) { super(name); } - public static Test suite() - { + public static Test suite() { return new TestSuite(ProcessPopulateTest.class); } - public static void main(String[] args) - { + public static void main(String[] args) { junit.textui.TestRunner.run(suite()); } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELAccessTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELAccessTest.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELAccessTest.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELAccessTest.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELAccessTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELAccessTest.java Wed Jan 19 11:00:31 2005 @@ -20,6 +20,7 @@ // java imports // internal imports + import org.apache.beehive.netui.test.script.AccessTest; import org.apache.beehive.netui.script.ExpressionEvaluator; @@ -33,20 +34,17 @@ * */ public class NetUIELAccessTest - extends AccessTest -{ - protected ExpressionEvaluator getExpressionEvaluator() - { + extends AccessTest { + + protected ExpressionEvaluator getExpressionEvaluator() { return ExpressionEvaluatorFactory.getInstance("netuiel"); } - public NetUIELAccessTest(String name) - { + public NetUIELAccessTest(String name) { super(name); } - public static Test suite() - { + public static Test suite() { TestSuite suite = new TestSuite(); suite.addTest(new NetUIELAccessTest("testAccess")); @@ -55,8 +53,7 @@ return suite; } - public static void main(String[] args) - { + public static void main(String[] args) { junit.textui.TestRunner.run(suite()); } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELBundleScriptTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELBundleScriptTest.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELBundleScriptTest.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELBundleScriptTest.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELBundleScriptTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELBundleScriptTest.java Wed Jan 19 11:00:31 2005 @@ -20,6 +20,7 @@ // java imports // internal imports + import org.apache.beehive.netui.test.script.BundleScriptTest; import org.apache.beehive.netui.script.ExpressionEvaluator; @@ -33,20 +34,17 @@ * */ public class NetUIELBundleScriptTest - extends BundleScriptTest -{ - protected ExpressionEvaluator getExpressionEvaluator() - { - return ExpressionEvaluatorFactory.getInstance("netuiel"); + extends BundleScriptTest { + + protected ExpressionEvaluator getExpressionEvaluator() { + return ExpressionEvaluatorFactory.getInstance("netuiel"); } - public NetUIELBundleScriptTest(String name) - { + public NetUIELBundleScriptTest(String name) { super(name); } - public static Test suite() - { + public static Test suite() { TestSuite suite = new TestSuite(); suite.addTest(new NetUIELBundleScriptTest("testSimple")); suite.addTest(new NetUIELBundleScriptTest("testLocaleSupport")); @@ -54,8 +52,7 @@ return suite; } - public static void main(String[] args) - { + public static void main(String[] args) { junit.textui.TestRunner.run(suite()); } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELCustomBindingContextTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELCustomBindingContextTest.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELCustomBindingContextTest.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELCustomBindingContextTest.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELCustomBindingContextTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELCustomBindingContextTest.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.test.script.el; // java imports + import java.io.InputStream; // internal imports @@ -38,52 +39,44 @@ * */ public class NetUIELCustomBindingContextTest - extends AbstractExpressionTest -{ + extends AbstractExpressionTest { + public void testCustomBindingContext() - throws Exception - { + throws Exception { // load the NetUI config file so that the custom binding contexts // are initialized correctly // @todo: there needs to be a general mechanism such that different // configurations can be passed to the expression engine / etc InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/beehive/netui/qa/util/netui-config.xml"); ConfigUtil.init(is); - + PortalVariableResolver.SkinBean skinBean = new PortalVariableResolver.SkinBean(); Object result = evaluateExpression("{portal.skin.stringProperty}", getPageContext()); assertEquals(skinBean.getStringProperty(), result); boolean success = false; - try - { + try { evaluateExpression("{portal.notSkin.stringProperty}", getPageContext()); - } - catch(Exception e) - { + } catch(Exception e) { success = true; } assertTrue(success); } - protected ExpressionEvaluator getExpressionEvaluator() - { + protected ExpressionEvaluator getExpressionEvaluator() { return ExpressionEvaluatorFactory.getInstance("netuiel"); } - public NetUIELCustomBindingContextTest(String name) - { + public NetUIELCustomBindingContextTest(String name) { super(name); } - public static Test suite() - { + public static Test suite() { return new TestSuite(NetUIELCustomBindingContextTest.class); } - public static void main(String[] args) - { + public static void main(String[] args) { junit.textui.TestRunner.run(suite()); } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionObjectTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionObjectTest.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionObjectTest.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionObjectTest.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionObjectTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionObjectTest.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.test.script.el; // java imports + import java.util.List; // internal imports @@ -32,43 +33,37 @@ import junit.framework.TestSuite; public class NetUIELExpressionObjectTest - extends TestCase -{ + extends TestCase { + private static final Logger _logger = Logger.getInstance(NetUIELExpressionObjectTest.class); - public void testSimple() - { + public void testSimple() { ExpressionEvaluator ee = createExpressionEvaluator(); - + Expression expr = ee.parseExpression("{actionForm.customers[42].orders[12].lineItems[3].name}"); - + List tokens = expr.getTokens(); - for(int i = 0; i < tokens.size(); i++) - { + for(int i = 0; i < tokens.size(); i++) { System.out.println("tokens[" + i + "]: " + tokens.get(i)); } expr = ee.parseExpression("{container.item.foo.bar.blee}"); System.out.println("expression from index 2: " + expr.getExpression(2)); } - - private static final ExpressionEvaluator createExpressionEvaluator() - { + + private static final ExpressionEvaluator createExpressionEvaluator() { return new ExpressionEvaluatorImpl(); } - public NetUIELExpressionObjectTest(String name) - { + public NetUIELExpressionObjectTest(String name) { super(name); } - public static Test suite() - { + public static Test suite() { return new TestSuite(NetUIELExpressionObjectTest.class); } - public static void main(String[] args) - { + public static void main(String[] args) { junit.textui.TestRunner.run(suite()); } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionTest.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionTest.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionTest.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionTest.java Wed Jan 19 11:00:31 2005 @@ -20,6 +20,7 @@ // java imports // internal imports + import org.apache.beehive.netui.test.script.ExpressionTest; import org.apache.beehive.netui.script.ExpressionEvaluator; @@ -33,35 +34,28 @@ * */ public class NetUIELExpressionTest - extends ExpressionTest -{ - protected ExpressionEvaluator getExpressionEvaluator() - { + extends ExpressionTest { + + protected ExpressionEvaluator getExpressionEvaluator() { return ExpressionEvaluatorFactory.getInstance("netuiel"); } - public NetUIELExpressionTest(String name) - { + public NetUIELExpressionTest(String name) { super(name); } - public void testNetUIELContainsExpression() - { - try - { + public void testNetUIELContainsExpression() { + try { ExpressionEvaluator ee = getExpressionEvaluator(); System.out.println("contains expression: " + ee.containsExpression("{pageFlow.foo")); - } - catch(Exception e) - { + } catch(Exception e) { System.out.println("Caught exception doing containsExpression: " + e); e.printStackTrace(); throw new RuntimeException("The containsExpression call threw an exception when it shouldn't have", e); } } - public static Test suite() - { + public static Test suite() { TestSuite suite = new TestSuite(); suite.addTest(new NetUIELExpressionTest("testStrangeCharacters")); @@ -85,8 +79,7 @@ return suite; } - public static void main(String[] args) - { + public static void main(String[] args) { junit.textui.TestRunner.run(suite()); } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionUpdateTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionUpdateTest.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionUpdateTest.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionUpdateTest.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionUpdateTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionUpdateTest.java Wed Jan 19 11:00:31 2005 @@ -28,26 +28,23 @@ * */ public class NetUIELExpressionUpdateTest - extends ExpressionUpdateTest -{ - protected ExpressionEvaluator getExpressionEvaluator() - { + extends ExpressionUpdateTest { + + protected ExpressionEvaluator getExpressionEvaluator() { return ExpressionEvaluatorFactory.getInstance("netuiel"); } - - public NetUIELExpressionUpdateTest(String name) - { + + public NetUIELExpressionUpdateTest(String name) { super(name); } - public static Test suite() - { + public static Test suite() { TestSuite suite = new TestSuite(); suite.addTest(new NetUIELExpressionUpdateTest("testNonexistentPropertySet")); suite.addTest(new NetUIELExpressionUpdateTest("testPrimitiveUpdate")); suite.addTest(new NetUIELExpressionUpdateTest("testPrimitiveWrapperUpdate")); - suite.addTest(new NetUIELExpressionUpdateTest("testArrayUpdate")); + suite.addTest(new NetUIELExpressionUpdateTest("testArrayUpdate")); suite.addTest(new NetUIELExpressionUpdateTest("testComplexUpdateExpressionEvaluation")); suite.addTest(new NetUIELExpressionUpdateTest("testSettingComplexTypes")); suite.addTest(new NetUIELExpressionUpdateTest("testWritableContexts")); @@ -57,8 +54,7 @@ return suite; } - public static void main(String[] args) - { + public static void main(String[] args) { junit.textui.TestRunner.run(suite()); } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELPageInputTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELPageInputTest.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELPageInputTest.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELPageInputTest.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELPageInputTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELPageInputTest.java Wed Jan 19 11:00:31 2005 @@ -28,25 +28,24 @@ * */ public class NetUIELPageInputTest - extends PageInputTest -{ - public NetUIELPageInputTest(String name) {super(name);} - - protected ExpressionEvaluator getExpressionEvaluator() - { - return ExpressionEvaluatorFactory.getInstance("netuiel"); + extends PageInputTest { + + public NetUIELPageInputTest(String name) { + super(name); } - - public static Test suite() - { + + protected ExpressionEvaluator getExpressionEvaluator() { + return ExpressionEvaluatorFactory.getInstance("netuiel"); + } + + public static Test suite() { TestSuite suite = new TestSuite(); suite.addTest(new NetUIELPageInputTest("testPageInputs")); suite.addTest(new NetUIELPageInputTest("testActionOutputs")); return suite; } - - public static void main(String[] args) - { + + public static void main(String[] args) { junit.textui.TestRunner.run(suite()); } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELParsedExpressionTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELParsedExpressionTest.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELParsedExpressionTest.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELParsedExpressionTest.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELParsedExpressionTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELParsedExpressionTest.java Wed Jan 19 11:00:31 2005 @@ -20,6 +20,7 @@ // java imports // internal imports + import org.apache.beehive.netui.test.script.ParsedExpressionTest; import org.apache.beehive.netui.script.ExpressionEvaluator; import org.apache.beehive.netui.script.ExpressionEvaluatorFactory; @@ -32,27 +33,23 @@ * */ public class NetUIELParsedExpressionTest - extends ParsedExpressionTest -{ - protected ExpressionEvaluator getExpressionEvaluator() - { + extends ParsedExpressionTest { + + protected ExpressionEvaluator getExpressionEvaluator() { return ExpressionEvaluatorFactory.getInstance("netuiel"); } - public NetUIELParsedExpressionTest(String name) - { + public NetUIELParsedExpressionTest(String name) { super(name); } - public static Test suite() - { + public static Test suite() { TestSuite suite = new TestSuite(); suite.addTest(new NetUIELParsedExpressionTest("testParsedExpression")); return suite; } - public static void main(String[] args) - { + public static void main(String[] args) { junit.textui.TestRunner.run(suite()); } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/simpleaction/InternalExpressionUtilsTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/simpleaction/InternalExpressionUtilsTest.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/simpleaction/InternalExpressionUtilsTest.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/simpleaction/InternalExpressionUtilsTest.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/simpleaction/InternalExpressionUtilsTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/simpleaction/InternalExpressionUtilsTest.java Wed Jan 19 11:00:31 2005 @@ -22,6 +22,7 @@ import org.apache.beehive.netui.test.servlet.ServletFactory; import org.apache.beehive.netui.test.beans.SimpleTypeActionForm; import org.apache.beehive.netui.test.beans.FooJavaBean; + import junit.framework.TestCase; import junit.framework.Test; import junit.framework.TestSuite; @@ -33,8 +34,8 @@ import javax.servlet.http.HttpServletRequest; public class InternalExpressionUtilsTest - extends TestCase -{ + extends TestCase { + private static final Logger _logger = Logger.getInstance(InternalExpressionUtilsTest.class); private HttpServletRequest _request = null; @@ -42,13 +43,11 @@ private SimpleTypeActionForm _actionForm = null; private FooJavaBean _beanActionForm = null; - public InternalExpressionUtilsTest(String name) - { + public InternalExpressionUtilsTest(String name) { super(name); } - public void setUp() - { + public void setUp() { PageContext _pageContext = ServletFactory.getPageContext(); _request = (HttpServletRequest)_pageContext.getRequest(); _servletContext = _pageContext.getServletContext(); @@ -57,8 +56,7 @@ } public void testConditionEvaluation() - throws ELException - { + throws ELException { boolean result = evaluateCondition("${actionForm.boolProperty}"); assertFalse(result); @@ -92,33 +90,28 @@ } public void testMessageEvaluation() - throws ELException - { + throws ELException { String result = evaluateMessage("${actionForm.stringProperty}"); assertEquals(result, _actionForm.getStringProperty()); } private final boolean evaluateCondition(String expression) - throws ELException - { + throws ELException { return InternalExpressionUtils.evaluateCondition(expression, _actionForm, _request, _servletContext); } private final String evaluateMessage(String expression) - throws ELException - { + throws ELException { return InternalExpressionUtils.evaluateMessage(expression, _actionForm, _request, _servletContext); } - public static Test suite() - { + public static Test suite() { TestSuite suite = new TestSuite(); suite.addTestSuite(InternalExpressionUtilsTest.class); return suite; } - public static void main(String[] args) - { + public static void main(String[] args) { junit.textui.TestRunner.run(suite()); } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/FauxPageContext.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/FauxPageContext.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/FauxPageContext.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/FauxPageContext.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/FauxPageContext.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/FauxPageContext.java Wed Jan 19 11:00:31 2005 @@ -40,8 +40,8 @@ * */ public class FauxPageContext - extends PageContext -{ + extends PageContext { + private Hashtable _attributes = null; private HttpServletRequest _request = null; private HttpServletResponse _response = null; @@ -51,8 +51,7 @@ public FauxPageContext(HttpServletRequest request, HttpServletResponse response, HttpSession session, - ServletContext servletContext) - { + ServletContext servletContext) { super(); _request = request; @@ -62,98 +61,111 @@ _attributes = new Hashtable(); } - public Object findAttribute(String name) - { + public Object findAttribute(String name) { Object ret = null; ret = getAttribute(name); - if(ret == null) - { + if(ret == null) { ret = getAttribute(name, REQUEST_SCOPE); if(ret == null) ret = getAttribute(name, SESSION_SCOPE); if(ret == null) ret = getAttribute(name, APPLICATION_SCOPE); } - + return ret; } - public Object getAttribute(String name) - { + public Object getAttribute(String name) { return _attributes.get(name); } - public Enumeration getAttributeNamesInScope(int scope) - { + public Enumeration getAttributeNamesInScope(int scope) { switch(scope) { - case PAGE_SCOPE: return _attributes.keys(); - case REQUEST_SCOPE: return _request.getAttributeNames(); - case SESSION_SCOPE: return _session.getAttributeNames(); - case APPLICATION_SCOPE: return _servletContext.getAttributeNames(); - default: throw new IllegalStateException("The scope specified by the index \"" + scope + "\" is not valid."); + case PAGE_SCOPE: + return _attributes.keys(); + case REQUEST_SCOPE: + return _request.getAttributeNames(); + case SESSION_SCOPE: + return _session.getAttributeNames(); + case APPLICATION_SCOPE: + return _servletContext.getAttributeNames(); + default: + throw new IllegalStateException("The scope specified by the index \"" + scope + "\" is not valid."); } - + } - public Object getAttribute(String name, int scope) - { - switch(scope) - { - case PAGE_SCOPE: return _attributes.get(name); - case REQUEST_SCOPE: return _request.getAttribute(name); - case SESSION_SCOPE: return _session.getAttribute(name); - case APPLICATION_SCOPE: return _servletContext.getAttribute(name); - default: throw new IllegalStateException("The scope specified by the index \"" + scope + "\" is not valid."); + public Object getAttribute(String name, int scope) { + switch(scope) { + case PAGE_SCOPE: + return _attributes.get(name); + case REQUEST_SCOPE: + return _request.getAttribute(name); + case SESSION_SCOPE: + return _session.getAttribute(name); + case APPLICATION_SCOPE: + return _servletContext.getAttribute(name); + default: + throw new IllegalStateException("The scope specified by the index \"" + scope + "\" is not valid."); } } - public void removeAttribute(String name) - { + public void removeAttribute(String name) { _attributes.remove(name); } - public void removeAttribute(String name, int scope) - { - switch(scope) - { - case PAGE_SCOPE: _attributes.remove(name); return; - case REQUEST_SCOPE: _request.removeAttribute(name); return; - case SESSION_SCOPE: _session.removeAttribute(name); return; - case APPLICATION_SCOPE: _servletContext.removeAttribute(name); return; - default: throw new IllegalStateException("The scope specified by the index \"" + scope + "\" is not valid."); + public void removeAttribute(String name, int scope) { + switch(scope) { + case PAGE_SCOPE: + _attributes.remove(name); + return; + case REQUEST_SCOPE: + _request.removeAttribute(name); + return; + case SESSION_SCOPE: + _session.removeAttribute(name); + return; + case APPLICATION_SCOPE: + _servletContext.removeAttribute(name); + return; + default: + throw new IllegalStateException("The scope specified by the index \"" + scope + "\" is not valid."); } } - public void setAttribute(String name, Object attribute) - { + public void setAttribute(String name, Object attribute) { _attributes.put(name, attribute); } - public void setAttribute(String name, Object o, int scope) - { - switch(scope) - { - case PAGE_SCOPE: _attributes.put(name, o); return; - case REQUEST_SCOPE: _request.setAttribute(name, o); return; - case SESSION_SCOPE: _session.setAttribute(name, o); return; - case APPLICATION_SCOPE: _servletContext.setAttribute(name, o); return; - default: throw new IllegalStateException("The scope specified by the index \"" + scope + "\" is not valid."); - } + public void setAttribute(String name, Object o, int scope) { + switch(scope) { + case PAGE_SCOPE: + _attributes.put(name, o); + return; + case REQUEST_SCOPE: + _request.setAttribute(name, o); + return; + case SESSION_SCOPE: + _session.setAttribute(name, o); + return; + case APPLICATION_SCOPE: + _servletContext.setAttribute(name, o); + return; + default: + throw new IllegalStateException("The scope specified by the index \"" + scope + "\" is not valid."); + } } - public ServletRequest getRequest() - { + public ServletRequest getRequest() { return _request; } - public ServletContext getServletContext() - { + public ServletContext getServletContext() { return _servletContext; } - public HttpSession getSession() - { + public HttpSession getSession() { return _session; } @@ -163,74 +175,70 @@ * * ============================================ */ - public void forward(String path) - {} + public void forward(String path) { + } + + public int getAttributesScope(String name) { + return -1; + } - public int getAttributesScope(String name) - {return -1;} + public Exception getException() { + return null; + } - public Exception getException() - {return null;} - - public JspWriter getOut() - {return null;} + public JspWriter getOut() { + return null; + } - public Object getPage() - {return null;} + public Object getPage() { + return null; + } - public ServletResponse getResponse() - { + public ServletResponse getResponse() { return _response; } - public ServletConfig getServletConfig() - { + public ServletConfig getServletConfig() { return null; } - public void handlePageException(Exception e) - {} + public void handlePageException(Exception e) { + } - public void handlePageException(Throwable e) - {} + public void handlePageException(Throwable e) { + } - public void include(String path) - {} + public void include(String path) { + } public void initialize(Servlet servlet, ServletRequest req, ServletResponse resp, String errorPageUrl, boolean needsSession, int bufferSize, - boolean autoFlush) - { + boolean autoFlush) { } - public JspWriter popBody() - { + public JspWriter popBody() { return null; } - public BodyContent pushBody() - { + public BodyContent pushBody() { return null; } - public void release() - {} + public void release() { + } // Servlet 2.4 method implementation - public void include(String string, boolean bool) - { + public void include(String string, boolean bool) { } // Servlet 2.4 method implementation - public VariableResolver getVariableResolver() - { + public VariableResolver getVariableResolver() { return new FauxVariableResolver(this); } // Servlet 2.4 method implementation - public javax.servlet.jsp.el.ExpressionEvaluator getExpressionEvaluator() - { + public javax.servlet.jsp.el.ExpressionEvaluator getExpressionEvaluator() { return null; } @@ -246,12 +254,10 @@ } public Object resolveVariable(String name) - throws ELException - { + throws ELException { try { return _vr.resolveVariable(name, _pageContext); - } - catch(org.apache.taglibs.standard.lang.jstl.ELException e) { + } catch(org.apache.taglibs.standard.lang.jstl.ELException e) { throw new ELException(e); } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/HttpServletRequestHandler.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/HttpServletRequestHandler.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/HttpServletRequestHandler.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/HttpServletRequestHandler.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/HttpServletRequestHandler.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/HttpServletRequestHandler.java Wed Jan 19 11:00:31 2005 @@ -31,9 +31,9 @@ * */ public class HttpServletRequestHandler - extends ServletHandler -{ - /* + extends ServletHandler { + + /* * this is a java.util.Hashtable because the HttpServletRequest returns an Enumeration, * and it's the only Map implementation that returns an Enumeration. Fun, huh? */ @@ -42,31 +42,26 @@ private String _queryString = null; private HttpSession _session = null; - public HttpServletRequestHandler() - { + public HttpServletRequestHandler() { super(); _params = new Hashtable(); } - public void setSession(HttpSession session) - { + public void setSession(HttpSession session) { _session = session; } - public void addParam(String key, Object value) - { + public void addParam(String key, Object value) { List list = (List)_params.get(key); - if(list == null) - { + if(list == null) { list = new ArrayList(); list.add(value); _params.put(key, list); - } - else list.add(value); + } else + list.add(value); } - public void setQueryString(String queryString) - { + public void setQueryString(String queryString) { _queryString = queryString; _params = null; @@ -79,64 +74,51 @@ _params = new Hashtable(); String[] queryParams = queryString.split("&"); - for(int i = 0; i < queryParams.length; i++) - { + for(int i = 0; i < queryParams.length; i++) { String[] keyValue = queryParams[i].split("="); - + String key = keyValue[0]; String value = null; - + if(keyValue.length == 1 || keyValue[1] == null) value = ""; - else value = keyValue[1]; + else + value = keyValue[1]; - if(_params.containsKey(keyValue[0])) - { + if(_params.containsKey(keyValue[0])) { ((List)_params.get(key)).add(value); - } - else - { + } else { List list = new ArrayList(); list.add(value); - + _params.put(key, list); } } } - public Object invoke(Object proxy, Method method, Object[] args) - { - if(method.getName().equals("getParameter")) - { + public Object invoke(Object proxy, Method method, Object[] args) { + if(method.getName().equals("getParameter")) { String key = (String)args[0]; Object o = _params.get(key); if(o == null) return null; - else if(o instanceof List) - { + else if(o instanceof List) { return ((List)o).get(0); - } - else - { + } else { assert (o instanceof String[]); return ((String[])o)[0]; } - } - else if(method.getName().equals("getParameterValues")) - { + } else if(method.getName().equals("getParameterValues")) { String key = (String)args[0]; List list = (List)_params.get(key); return listToStrAry(list); - } - else if(method.getName().equals("getParameterNames")) - { + } else if(method.getName().equals("getParameterNames")) { return _params.keys(); - } - else if(method.getName().equals("getQueryString")) + } else if(method.getName().equals("getQueryString")) return _queryString; else if(method.getName().equals("getParameter")) return _params.get(args[0]); @@ -146,47 +128,44 @@ return null; else if(method.getName().equals("getMethod")) return "POST"; - else if(method.getName().equals("getParameterMap")) - { - HashMap map = new HashMap(); - Enumeration e = _params.keys(); - while(e.hasMoreElements()) - { - String key = (String)e.nextElement(); - String[] ary = listToStrAry((List)_params.get(key)); - - map.put(key, ary); - } - return map; - } - else if(method.getName().equals("equals")) - { + else if(method.getName().equals("getParameterMap")) { + HashMap map = new HashMap(); + Enumeration e = _params.keys(); + while(e.hasMoreElements()) { + String key = (String)e.nextElement(); + String[] ary = listToStrAry((List)_params.get(key)); + + map.put(key, ary); + } + return map; + } else if(method.getName().equals("equals")) { Object eq = args[0]; - if(eq == null) return Boolean.FALSE; - else if(!(eq instanceof HttpServletRequest)) return Boolean.FALSE; + if(eq == null) + return Boolean.FALSE; + else if(!(eq instanceof HttpServletRequest)) + return Boolean.FALSE; // don't laugh; this works in this context else if(Proxy.isProxyClass(eq.getClass()) && (System.identityHashCode(this) == System.identityHashCode(Proxy.getInvocationHandler(eq)))) return Boolean.TRUE; - else return Boolean.FALSE; - } - else if(method.getName().equals("getContextPath")) + else + return Boolean.FALSE; + } else if(method.getName().equals("getContextPath")) return "/netuiFauxTestWeb"; else if(method.getName().equals("getServletPath")) return "/netuiFauxTestWeb/fauxServlet"; - else return super.invoke(proxy, method, args); + else + return super.invoke(proxy, method, args); } - private String[] listToStrAry(List list) - { - if (list == null) + private String[] listToStrAry(List list) { + if(list == null) return null; String[] ary = new String[list.size()]; - for(int i = 0; i < ary.length; i++) - { + for(int i = 0; i < ary.length; i++) { ary[i] = (String)list.get(i); } - + return ary; } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/HttpServletResponseHandler.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/HttpServletResponseHandler.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/HttpServletResponseHandler.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/HttpServletResponseHandler.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/HttpServletResponseHandler.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/HttpServletResponseHandler.java Wed Jan 19 11:00:31 2005 @@ -24,16 +24,17 @@ * */ public class HttpServletResponseHandler - implements InvocationHandler -{ + implements InvocationHandler { + private static final String UTF_8 = "UTF-8"; - public HttpServletResponseHandler() {} + public HttpServletResponseHandler() { + } - public Object invoke(Object proxy, Method method, Object[] args) - { + public Object invoke(Object proxy, Method method, Object[] args) { if(method.getName().equals("getCharacterEncoding")) return UTF_8; - else throw new UnsupportedOperationException("Can not invoke method (" + method + "); this proxy does not support the method."); - } + else + throw new UnsupportedOperationException("Can not invoke method (" + method + "); this proxy does not support the method."); + } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletFactory.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletFactory.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletFactory.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletFactory.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletFactory.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletFactory.java Wed Jan 19 11:00:31 2005 @@ -28,52 +28,45 @@ /** * */ -public class ServletFactory -{ - public static HttpSession getSession() - { +public class ServletFactory { + + public static HttpSession getSession() { return (HttpSession)create(HttpSession.class); } - public static HttpServletRequest getServletRequest() - { + public static HttpServletRequest getServletRequest() { ServletHandler handler = new HttpServletRequestHandler(); return (HttpServletRequest)Proxy.newProxyInstance(handler.getClass().getClassLoader(), - new Class[] {HttpServletRequest.class}, - handler); + new Class[]{HttpServletRequest.class}, + handler); } - public static HttpServletRequest getServletRequest(String query) - { + public static HttpServletRequest getServletRequest(String query) { HttpServletRequestHandler handler = new HttpServletRequestHandler(); handler.setQueryString(query); return (HttpServletRequest)Proxy.newProxyInstance(handler.getClass().getClassLoader(), - new Class[] {HttpServletRequest.class}, - handler); + new Class[]{HttpServletRequest.class}, + handler); } - public static HttpServletResponse getServletResponse() - { + public static HttpServletResponse getServletResponse() { InvocationHandler handler = new HttpServletResponseHandler(); return (HttpServletResponse)Proxy.newProxyInstance(handler.getClass().getClassLoader(), - new Class[] {HttpServletResponse.class}, - handler); + new Class[]{HttpServletResponse.class}, + handler); } - public static ServletContext getServletContext() - { + public static ServletContext getServletContext() { return (ServletContext)create(ServletContext.class); } public static PageContext getPageContext(HttpServletRequest request, HttpServletResponse response, - HttpSession session, ServletContext application) - { + HttpSession session, ServletContext application) { return new FauxPageContext(request, response, session, application); } - public static PageContext getPageContext() - { + public static PageContext getPageContext() { HttpServletRequest request = ServletFactory.getServletRequest(); HttpServletResponse response = ServletFactory.getServletResponse(); HttpSession session = ServletFactory.getSession(); @@ -83,15 +76,14 @@ h.setSession(session); PageContext pageContext = getPageContext(request, response, session, application); - + return pageContext; } - private static Object create(Class type) - { + private static Object create(Class type) { ServletHandler handler = new ServletHandler(); return Proxy.newProxyInstance(type.getClassLoader(), - new Class[] {type}, - handler); + new Class[]{type}, + handler); } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletHandler.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletHandler.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletHandler.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletHandler.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletHandler.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletHandler.java Wed Jan 19 11:00:31 2005 @@ -27,46 +27,37 @@ * */ public class ServletHandler - implements InvocationHandler -{ + implements InvocationHandler { + private Map _attributes = null; - public ServletHandler() - { + public ServletHandler() { _attributes = new HashMap(); } - public Object invoke(Object proxy, Method method, Object[] args) - { - if(method.getName().endsWith("getAttribute")) - { + public Object invoke(Object proxy, Method method, Object[] args) { + if(method.getName().endsWith("getAttribute")) { String key = (String)args[0]; return _attributes.get(key); - } - else if(method.getName().endsWith("getAttributeNames")) - { + } else if(method.getName().endsWith("getAttributeNames")) { return Collections.enumeration(_attributes.keySet()); - } - else if(method.getName().endsWith("setAttribute")) - { + } else if(method.getName().endsWith("setAttribute")) { String key = (String)args[0]; Object value = args[1]; _attributes.put(key, value); return null; - } - else if(method.getName().endsWith("removeAttribute")) - { + } else if(method.getName().endsWith("removeAttribute")) { String key = (String)args[0]; _attributes.remove(key); return null; - } - else if(method.getName().equals("toString")) + } else if(method.getName().equals("toString")) return ""; else if(method.getName().equals("isSecure")) return false; - else throw new UnsupportedOperationException("Can not invoke method (" + method + "); this proxy does not support the method."); + else + throw new UnsupportedOperationException("Can not invoke method (" + method + "); this proxy does not support the method."); } - + } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/tools/AssertHelper.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/tools/AssertHelper.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/tools/AssertHelper.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/tools/AssertHelper.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/tools/AssertHelper.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/tools/AssertHelper.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.test.tools; // java imports + import java.lang.reflect.Array; // internal imports @@ -27,46 +28,40 @@ /** * Helpers; these are assertEquals(...), etc... methods that JUnit does not provide. - * + * <p/> * Many of these methods compare String[] to some Java type and convert the String into * the compare-to type such as a Boolean, boolean, or Float. - * + * <p/> * Note, for the double / floating comparisons, these may fail on some VMs because of precision * comparison problems. */ -public class AssertHelper -{ - public static void assertEquals(double expected, double actual) - { +public class AssertHelper { + + public static void assertEquals(double expected, double actual) { if(expected != actual) throw new AssertionFailedError("Double assert failed; actual = " + actual + " expected = " + expected); } - public static void assertEquals(float expected, float actual) - { + public static void assertEquals(float expected, float actual) { if(expected != actual) throw new AssertionFailedError("Float assert failed; actual = " + actual + " expected = " + expected); } - public static void assertEquals(String[] exp, String[] act) - { + public static void assertEquals(String[] exp, String[] act) { checkArrays(exp, act); - for(int i = 0; i < exp.length; i++) - { + for(int i = 0; i < exp.length; i++) { if(!exp[i].equals(act[i])) throw new AssertionFailedError("The values expected[" + i + "]=\"" + exp[i] + "\" does not equal actual[" + i + "]=\"" + act[i] + "\""); } - return; + return; } - public static void assertEquals(String[] exp, boolean[] act) - { + public static void assertEquals(String[] exp, boolean[] act) { checkArrays(exp, act); - for(int i = 0; i < exp.length; i++) - { + for(int i = 0; i < exp.length; i++) { if(Boolean.valueOf(exp[i]).booleanValue() != act[i]) throw new AssertionFailedError("The values expected[" + i + "]=" + exp[i] + " does not equal actual[" + i + "]=" + act[i]); } @@ -74,12 +69,10 @@ return; } - public static void assertEquals(String[] exp, int[] act) - { + public static void assertEquals(String[] exp, int[] act) { checkArrays(exp, act); - for(int i = 0; i < exp.length; i++) - { + for(int i = 0; i < exp.length; i++) { if(Integer.parseInt(exp[i]) != act[i]) throw new AssertionFailedError("The values expected[" + i + "]=" + exp[i] + " does not equal actual[" + i + "]=" + act[i]); } @@ -87,12 +80,10 @@ return; } - public static void assertEquals(String[] exp, char[] act) - { + public static void assertEquals(String[] exp, char[] act) { checkArrays(exp, act); - for(int i = 0; i < exp.length; i++) - { + for(int i = 0; i < exp.length; i++) { if(exp[i].charAt(0) != act[i]) throw new AssertionFailedError("The values expected[" + i + "]=" + exp[i] + " does not equal actual[" + i + "]=" + act[i]); } @@ -100,12 +91,10 @@ return; } - public static void assertEquals(String[] exp, byte[] act) - { + public static void assertEquals(String[] exp, byte[] act) { checkArrays(exp, act); - for(int i = 0; i < exp.length; i++) - { + for(int i = 0; i < exp.length; i++) { if(Byte.valueOf(exp[i]).byteValue() != act[i]) throw new AssertionFailedError("The values expected[" + i + "]=" + exp[i] + " does not equal actual[" + i + "]=" + act[i]); } @@ -113,12 +102,10 @@ return; } - public static void assertEquals(String[] exp, double[] act) - { + public static void assertEquals(String[] exp, double[] act) { checkArrays(exp, act); - for(int i = 0; i < exp.length; i++) - { + for(int i = 0; i < exp.length; i++) { if(Double.parseDouble(exp[i]) != act[i]) throw new AssertionFailedError("The values expected[" + i + "]=" + exp[i] + " does not equal actual[" + i + "]=" + act[i]); } @@ -126,12 +113,10 @@ return; } - public static void assertEquals(String[] exp, float[] act) - { + public static void assertEquals(String[] exp, float[] act) { checkArrays(exp, act); - for(int i = 0; i < exp.length; i++) - { + for(int i = 0; i < exp.length; i++) { if(Float.parseFloat(exp[i]) != act[i]) throw new AssertionFailedError("The values expected[" + i + "]=" + exp[i] + " does not equal actual[" + i + "]=" + act[i]); } @@ -139,12 +124,10 @@ return; } - public static void assertEquals(String[] exp, long[] act) - { + public static void assertEquals(String[] exp, long[] act) { checkArrays(exp, act); - for(int i = 0; i < exp.length; i++) - { + for(int i = 0; i < exp.length; i++) { if(Long.parseLong(exp[i]) != act[i]) throw new AssertionFailedError("The values expected[" + i + "]=" + exp[i] + " does not equal actual[" + i + "]=" + act[i]); } @@ -152,12 +135,10 @@ return; } - public static void assertEquals(String[] exp, short[] act) - { + public static void assertEquals(String[] exp, short[] act) { checkArrays(exp, act); - for(int i = 0; i < exp.length; i++) - { + for(int i = 0; i < exp.length; i++) { if(Short.parseShort(exp[i]) != act[i]) throw new AssertionFailedError("The values expected[" + i + "]=" + exp[i] + " does not equal actual[" + i + "]=" + act[i]); } @@ -165,16 +146,14 @@ return; } - public static void assertEquals(String[] exp, Boolean[] act) - { + public static void assertEquals(String[] exp, Boolean[] act) { checkArrays(exp, act); - for(int i = 0; i < exp.length; i++) - { - if( ((exp[i] == null || exp[i].equals("")) && act[i] == null) ) + for(int i = 0; i < exp.length; i++) { + if(((exp[i] == null || exp[i].equals("")) && act[i] == null)) return; else if((exp[i] == null || exp[i].equals("")) && act[i] != null) - throw new AssertionFailedError("The values expected[" + i + "]=" + exp[i] + " does not equal actual[" + i + "]=" + act[i]); + throw new AssertionFailedError("The values expected[" + i + "]=" + exp[i] + " does not equal actual[" + i + "]=" + act[i]); else if(Boolean.valueOf(exp[i]).booleanValue() != act[i].booleanValue()) throw new AssertionFailedError("The values expected[" + i + "]=" + exp[i] + " does not equal actual[" + i + "]=" + act[i]); } @@ -182,29 +161,25 @@ return; } - public static void assertEquals(String[] exp, Byte[] act) - { + public static void assertEquals(String[] exp, Byte[] act) { checkArrays(exp, act); - for(int i = 0; i < exp.length; i++) - { - if( ((exp[i] == null || exp[i].equals("")) && act[i] == null) ) + for(int i = 0; i < exp.length; i++) { + if(((exp[i] == null || exp[i].equals("")) && act[i] == null)) return; else if((exp[i] == null || exp[i].equals("")) && act[i] != null) - throw new AssertionFailedError("The values expected[" + i + "]=" + exp[i] + " does not equal actual[" + i + "]=" + act[i]); - else if (Byte.valueOf(exp[i]).byteValue() != act[i].byteValue()) + throw new AssertionFailedError("The values expected[" + i + "]=" + exp[i] + " does not equal actual[" + i + "]=" + act[i]); + else if(Byte.valueOf(exp[i]).byteValue() != act[i].byteValue()) throw new AssertionFailedError("The values expected[" + i + "]=" + exp[i] + " does not equal actual[" + i + "]=" + act[i]); } return; } - public static void assertEquals(String[] exp, Integer[] act) - { + public static void assertEquals(String[] exp, Integer[] act) { checkArrays(exp, act); - - for(int i = 0; i < exp.length; i++) - { + + for(int i = 0; i < exp.length; i++) { if(Integer.parseInt(exp[i]) != act[i].intValue()) throw new AssertionFailedError("The values expected[" + i + "]=" + exp[i] + " does not equal actual[" + i + "]=" + act[i]); } @@ -212,12 +187,10 @@ return; } - public static void assertEquals(String[] exp, Character[] act) - { - checkArrays(exp, act); + public static void assertEquals(String[] exp, Character[] act) { + checkArrays(exp, act); - for(int i = 0; i < exp.length; i++) - { + for(int i = 0; i < exp.length; i++) { if(exp[i].charAt(0) != act[i].charValue()) throw new AssertionFailedError("The values expected[" + i + "]=" + exp[i] + " does not equal actual[" + i + "]=" + act[i]); } @@ -225,12 +198,10 @@ return; } - public static void assertEquals(String[] exp, Double[] act) - { + public static void assertEquals(String[] exp, Double[] act) { checkArrays(exp, act); - for(int i = 0; i < exp.length; i++) - { + for(int i = 0; i < exp.length; i++) { if(Double.parseDouble(exp[i]) != act[i].doubleValue()) throw new AssertionFailedError("The values expected[" + i + "]=" + exp[i] + " does not equal actual[" + i + "]=" + act[i]); } @@ -238,12 +209,10 @@ return; } - public static void assertEquals(String[] exp, Float[] act) - { + public static void assertEquals(String[] exp, Float[] act) { checkArrays(exp, act); - for(int i = 0; i < exp.length; i++) - { + for(int i = 0; i < exp.length; i++) { if(Float.parseFloat(exp[i]) != act[i].floatValue()) throw new AssertionFailedError("The values expected[" + i + "]=" + exp[i] + " does not equal actual[" + i + "]=" + act[i]); } @@ -251,12 +220,10 @@ return; } - public static void assertEquals(String[] exp, Long[] act) - { + public static void assertEquals(String[] exp, Long[] act) { checkArrays(exp, act); - for(int i = 0; i < exp.length; i++) - { + for(int i = 0; i < exp.length; i++) { if(Long.parseLong(exp[i]) != act[i].longValue()) throw new AssertionFailedError("The values expected[" + i + "]=" + exp[i] + " does not equal actual[" + i + "]=" + act[i]); } @@ -264,12 +231,10 @@ return; } - public static void assertEquals(String[] exp, Short[] act) - { + public static void assertEquals(String[] exp, Short[] act) { checkArrays(exp, act); - for(int i = 0; i < exp.length; i++) - { + for(int i = 0; i < exp.length; i++) { if(Long.parseLong(exp[i]) != act[i].shortValue()) throw new AssertionFailedError("The values expected[" + i + "]=" + exp[i] + " does not equal actual[" + i + "]=" + act[i]); } @@ -277,15 +242,14 @@ return; } - private static void checkArrays(Object exp, Object act) - { + private static void checkArrays(Object exp, Object act) { if(exp == null && act == null) return; else if((exp != null && act == null)) throw new AssertionFailedError("The expected array is non-null and the actual array is null."); else if(exp == null && act != null) - throw new AssertionFailedError("The actual array is non-null and the expected array is null."); - + throw new AssertionFailedError("The actual array is non-null and the expected array is null."); + assert exp.getClass().isArray() == true; assert act.getClass().isArray() == true; Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.test.util.config; // java imports + import java.io.InputStream; // internal imports @@ -35,40 +36,39 @@ * */ public class ConfigTest - extends TestCase -{ + extends TestCase { + private static final Logger logger = Logger.getInstance(ConfigTest.class); /** * Ensure that the default v2 NetUI config file parses. */ public void testValidate90Config() - throws Exception - { + throws Exception { InputStream is = getClass().getClassLoader().getResourceAsStream("WEB-INF/netui-config.xml"); - + ConfigUtil.init(is); NetuiConfig config = ConfigUtil.getConfig(); - + assert(config != null); } - public ConfigTest(String name) - { + public ConfigTest(String name) { super(name); } - public static Test suite() - { + public static Test suite() { return new TestSuite(ConfigTest.class); } - public static void main(String[] args) - { + public static void main(String[] args) { junit.textui.TestRunner.run(suite()); } - protected void setUp() {} - protected void tearDown() {} + protected void setUp() { + } + + protected void tearDown() { + } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/TestConfigUtil.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/TestConfigUtil.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/TestConfigUtil.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/TestConfigUtil.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/TestConfigUtil.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/TestConfigUtil.java Wed Jan 19 11:00:31 2005 @@ -40,8 +40,7 @@ try { InputStream is = TestConfigUtil.class.getClassLoader().getResourceAsStream(DEFAULT_CONFIG); testInit(is); - } - catch(ConfigInitializationException cie) { + } catch(ConfigInitializationException cie) { /* sometimes bad form to do this, but in the default case for testing, it's convenient to just bail with a runtime exception to just Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/IteratorFactoryTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/IteratorFactoryTest.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/IteratorFactoryTest.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/IteratorFactoryTest.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/IteratorFactoryTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/IteratorFactoryTest.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.test.util.iterator; // java imports + import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -34,23 +35,21 @@ * */ public class IteratorFactoryTest - extends TestCase -{ + extends TestCase { + public void testMapIterator() - throws Exception - { + throws Exception { Map map = new HashMap(); Iterator i = null; i = IteratorFactory.makeIterator(map); - + assertTrue(i instanceof MapIterator); assertNotNull(i); } public void testAtomicObjectIterator() - throws Exception - { + throws Exception { String s = new String("atomic"); Iterator i = null; i = IteratorFactory.makeIterator(s); @@ -62,22 +61,22 @@ assertNull(i); } - - public IteratorFactoryTest(String name) - { + + public IteratorFactoryTest(String name) { super(name); } - public static Test suite() - { + public static Test suite() { return new TestSuite(IteratorFactoryTest.class); } - public static void main(String[] args) - { + public static void main(String[] args) { junit.textui.TestRunner.run(suite()); } - protected void setUp() {} - protected void tearDown() {} + protected void setUp() { + } + + protected void tearDown() { + } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/type/TypeUtilsTest.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/type/TypeUtilsTest.java?view=diff&rev=125643&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/type/TypeUtilsTest.java&r1=125642&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/type/TypeUtilsTest.java&r2=125643 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/type/TypeUtilsTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/type/TypeUtilsTest.java Wed Jan 19 11:00:31 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.test.util.type; // java imports + import java.math.BigDecimal; import java.math.BigInteger; // import java.sql.Date; // there are tests for this below, but the name conflicts with java.util.Date @@ -41,124 +42,118 @@ * */ public class TypeUtilsTest - extends TestCase -{ + extends TestCase { + private static final Logger _logger = Logger.getInstance(TypeUtilsTest.class); // String value, target type, should convert, conversion validator private Object[][] _tests = - { - {"42", int.class, Boolean.TRUE, new Integer(42)}, - {"42.42", float.class, Boolean.TRUE, new Float(42.42)}, - - {"42", Integer.class, Boolean.TRUE, new Integer(42)}, - {"42.42", Float.class, Boolean.TRUE, new Float(42.42)}, - {"11/12/2002", java.util.Date.class, Boolean.TRUE, new java.util.Date("11/12/2002")}, - {"2002-11-12", java.sql.Date.class, Boolean.TRUE, java.sql.Date.valueOf("2002-11-12")}, - {"2002-11-12 00:00:00.00", java.sql.Timestamp.class, Boolean.TRUE, java.sql.Timestamp.valueOf("2002-11-12 00:00:00.00")}, - {"18:20:00", java.sql.Time.class, Boolean.TRUE, java.sql.Time.valueOf("18:20:00")}, - - {"", Integer.class, Boolean.TRUE, null}, - {"", Byte.class, Boolean.TRUE, null}, - {"", Double.class, Boolean.TRUE, null}, - {"", Float.class, Boolean.TRUE, null}, - {"", Long.class, Boolean.TRUE, null}, - {"", Short.class, Boolean.TRUE, null}, - {"", Character.class, Boolean.TRUE, null}, - {"", String.class, Boolean.TRUE, ""}, - {"", BigDecimal.class, Boolean.TRUE, null}, - {"", BigInteger.class, Boolean.TRUE, null}, - {null, Integer.class, Boolean.TRUE, null}, - {null, Byte.class, Boolean.TRUE, null}, - {null, Double.class, Boolean.TRUE, null}, - {null, Float.class, Boolean.TRUE, null}, - {null, Long.class, Boolean.TRUE, null}, - {null, Short.class, Boolean.TRUE, null}, - {null, Character.class, Boolean.TRUE, null}, - {null, String.class, Boolean.TRUE, null}, - {null, BigDecimal.class, Boolean.TRUE, null}, - {null, BigInteger.class, Boolean.TRUE, null}, - - {"1234", int.class, Boolean.TRUE, new Integer(1234)}, - {"-42", byte.class, Boolean.TRUE, new Byte((byte)-42)}, - {"3.1415", double.class, Boolean.TRUE, new Double(3.1415)}, - {"42.42", float.class, Boolean.TRUE, new Float(42.42)}, - {"123456789", long.class, Boolean.TRUE, new Long(123456789)}, - {"12", short.class, Boolean.TRUE, new Short((short)12)}, - {"A", char.class, Boolean.TRUE, new Character('A')}, - {"12345678987654321", BigDecimal.class, Boolean.TRUE, new BigDecimal("12345678987654321")}, - {"12345678987654321", BigInteger.class, Boolean.TRUE, new BigInteger("12345678987654321")}, - {"Now is the time for all good men to come to the aid of their country", String.class, Boolean.TRUE, - new String("Now is the time for all good men to come to the aid of their country")}, - - {"", int.class, Boolean.TRUE, new Integer(0)}, - {"", byte.class, Boolean.TRUE, new Byte((byte)0)}, - {"", double.class, Boolean.TRUE, new Double(0)}, - {"", float.class, Boolean.TRUE, new Float(0)}, - {"", long.class, Boolean.TRUE, new Long(0)}, - {"", short.class, Boolean.TRUE, new Short((short)0)}, - {"", char.class, Boolean.TRUE, new Character('\u0000')}, - {null, int.class, Boolean.TRUE, new Integer(0)}, - {null, byte.class, Boolean.TRUE, new Byte((byte)0)}, - {null, double.class, Boolean.TRUE, new Double(0)}, - {null, float.class, Boolean.TRUE, new Float(0)}, - {null, long.class, Boolean.TRUE, new Long(0)}, - {null, short.class, Boolean.TRUE, new Short((short)0)}, - {null, char.class, Boolean.TRUE, new Character('\u0000')}, - - // error cases - {"2002/11/12", java.util.Date.class, Boolean.FALSE, null}, - {"2002-11-12 00:00:00.00", java.sql.Date.class, Boolean.FALSE, null}, - {"11:12:11.00", java.sql.Time.class, Boolean.FALSE, null}, - {"asdf", java.sql.Timestamp.class, Boolean.FALSE, null}, - - {"abc", int.class, Boolean.FALSE, null}, - {"abc", byte.class, Boolean.FALSE, null}, - {"abc", double.class, Boolean.FALSE, null}, - {"abc", float.class, Boolean.FALSE, null}, - {"abc", long.class, Boolean.FALSE, null}, - {"abc", short.class, Boolean.FALSE, null}, - {"abc", int.class, Boolean.FALSE, null}, - {"abc", byte.class, Boolean.FALSE, null}, - {"abc", double.class, Boolean.FALSE, null}, - {"abc", float.class, Boolean.FALSE, null}, - {"abc", long.class, Boolean.FALSE, null}, - {"abc", short.class, Boolean.FALSE, null}, - }; + { + {"42", int.class, Boolean.TRUE, new Integer(42)}, + {"42.42", float.class, Boolean.TRUE, new Float(42.42)}, + + {"42", Integer.class, Boolean.TRUE, new Integer(42)}, + {"42.42", Float.class, Boolean.TRUE, new Float(42.42)}, + {"11/12/2002", java.util.Date.class, Boolean.TRUE, new java.util.Date("11/12/2002")}, + {"2002-11-12", java.sql.Date.class, Boolean.TRUE, java.sql.Date.valueOf("2002-11-12")}, + {"2002-11-12 00:00:00.00", java.sql.Timestamp.class, Boolean.TRUE, java.sql.Timestamp.valueOf("2002-11-12 00:00:00.00")}, + {"18:20:00", java.sql.Time.class, Boolean.TRUE, java.sql.Time.valueOf("18:20:00")}, + + {"", Integer.class, Boolean.TRUE, null}, + {"", Byte.class, Boolean.TRUE, null}, + {"", Double.class, Boolean.TRUE, null}, + {"", Float.class, Boolean.TRUE, null}, + {"", Long.class, Boolean.TRUE, null}, + {"", Short.class, Boolean.TRUE, null}, + {"", Character.class, Boolean.TRUE, null}, + {"", String.class, Boolean.TRUE, ""}, + {"", BigDecimal.class, Boolean.TRUE, null}, + {"", BigInteger.class, Boolean.TRUE, null}, + {null, Integer.class, Boolean.TRUE, null}, + {null, Byte.class, Boolean.TRUE, null}, + {null, Double.class, Boolean.TRUE, null}, + {null, Float.class, Boolean.TRUE, null}, + {null, Long.class, Boolean.TRUE, null}, + {null, Short.class, Boolean.TRUE, null}, + {null, Character.class, Boolean.TRUE, null}, + {null, String.class, Boolean.TRUE, null}, + {null, BigDecimal.class, Boolean.TRUE, null}, + {null, BigInteger.class, Boolean.TRUE, null}, + + {"1234", int.class, Boolean.TRUE, new Integer(1234)}, + {"-42", byte.class, Boolean.TRUE, new Byte((byte)-42)}, + {"3.1415", double.class, Boolean.TRUE, new Double(3.1415)}, + {"42.42", float.class, Boolean.TRUE, new Float(42.42)}, + {"123456789", long.class, Boolean.TRUE, new Long(123456789)}, + {"12", short.class, Boolean.TRUE, new Short((short)12)}, + {"A", char.class, Boolean.TRUE, new Character('A')}, + {"12345678987654321", BigDecimal.class, Boolean.TRUE, new BigDecimal("12345678987654321")}, + {"12345678987654321", BigInteger.class, Boolean.TRUE, new BigInteger("12345678987654321")}, + {"Now is the time for all good men to come to the aid of their country", String.class, Boolean.TRUE, + new String("Now is the time for all good men to come to the aid of their country")}, + + {"", int.class, Boolean.TRUE, new Integer(0)}, + {"", byte.class, Boolean.TRUE, new Byte((byte)0)}, + {"", double.class, Boolean.TRUE, new Double(0)}, + {"", float.class, Boolean.TRUE, new Float(0)}, + {"", long.class, Boolean.TRUE, new Long(0)}, + {"", short.class, Boolean.TRUE, new Short((short)0)}, + {"", char.class, Boolean.TRUE, new Character('\u0000')}, + {null, int.class, Boolean.TRUE, new Integer(0)}, + {null, byte.class, Boolean.TRUE, new Byte((byte)0)}, + {null, double.class, Boolean.TRUE, new Double(0)}, + {null, float.class, Boolean.TRUE, new Float(0)}, + {null, long.class, Boolean.TRUE, new Long(0)}, + {null, short.class, Boolean.TRUE, new Short((short)0)}, + {null, char.class, Boolean.TRUE, new Character('\u0000')}, + + // error cases + {"2002/11/12", java.util.Date.class, Boolean.FALSE, null}, + {"2002-11-12 00:00:00.00", java.sql.Date.class, Boolean.FALSE, null}, + {"11:12:11.00", java.sql.Time.class, Boolean.FALSE, null}, + {"asdf", java.sql.Timestamp.class, Boolean.FALSE, null}, + + {"abc", int.class, Boolean.FALSE, null}, + {"abc", byte.class, Boolean.FALSE, null}, + {"abc", double.class, Boolean.FALSE, null}, + {"abc", float.class, Boolean.FALSE, null}, + {"abc", long.class, Boolean.FALSE, null}, + {"abc", short.class, Boolean.FALSE, null}, + {"abc", int.class, Boolean.FALSE, null}, + {"abc", byte.class, Boolean.FALSE, null}, + {"abc", double.class, Boolean.FALSE, null}, + {"abc", float.class, Boolean.FALSE, null}, + {"abc", long.class, Boolean.FALSE, null}, + {"abc", short.class, Boolean.FALSE, null}, + }; public void testConverter() - throws Exception - { + throws Exception { int i = 0; - try - { - for(i = 0; i < _tests.length; i++) - { + try { + for(i = 0; i < _tests.length; i++) { String value = (String)_tests[i][0]; Class type = (Class)_tests[i][1]; boolean valid = ((Boolean)_tests[i][2]).booleanValue(); - + if(_logger.isDebugEnabled()) _logger.debug("tests[" + i + "]: convert \"" + value + "\" to type \"" + type + "\""); - + Object result = null; - try - { + try { result = TypeUtils.convertToObject(value, type, Locale.US); - - if(!valid) - throw new TestFailedException("The test case [" + i + "] failed because an illegal value \"" + - value + "\" was accepted in converting to type \"" + type + "\""); - } - catch(Exception e) - { + + if(!valid) + throw new TestFailedException("The test case [" + i + "] failed because an illegal value \"" + + value + "\" was accepted in converting to type \"" + type + "\""); + } catch(Exception e) { if(!valid) continue; else if(valid) - throw new TestFailedException("The test case [" + i + "] failed because an illegal value \"" + - value + "\" was accepted in converting to type \"" + type + "\""); + throw new TestFailedException("The test case [" + i + "] failed because an illegal value \"" + + value + "\" was accepted in converting to type \"" + type + "\""); } - + Object target = _tests[i][3]; boolean correct = false; if(target instanceof TypeConverterValidator) @@ -167,56 +162,49 @@ correct = true; else if((target == null && result != null) || (target != null && result == null)) correct = false; - else correct = target.equals(result); - - if(_logger.isDebugEnabled()) - { + else + correct = target.equals(result); + + if(_logger.isDebugEnabled()) { _logger.debug("target.toString(): " + target); _logger.debug("result.toString(): " + result); } - + if(!correct) - throw new TestFailedException("The test case [" + i + "] failed because the converted value \"" + - result + "\" did not match the expected value \"" + target + "\" in converting to type \"" + type.getName() + "\""); + throw new TestFailedException("The test case [" + i + "] failed because the converted value \"" + + result + "\" did not match the expected value \"" + target + "\" in converting to type \"" + type.getName() + "\""); } - } - catch(Exception e) - { + } catch(Exception e) { throw new TestFailedException("The test case [" + i + "] failed because an exception was thrown: " + e, e); } } - interface TypeConverterValidator - { + interface TypeConverterValidator { + boolean validate(Object value); } - class TestFailedException - extends RuntimeException - { - TestFailedException(String message) - { + class TestFailedException + extends RuntimeException { + + TestFailedException(String message) { super(message); } - TestFailedException(String message, Throwable cause) - { + TestFailedException(String message, Throwable cause) { super(message, cause); } } - public TypeUtilsTest(String name) - { + public TypeUtilsTest(String name) { super(name); } - public static Test suite() - { + public static Test suite() { return new TestSuite(TypeUtilsTest.class); } - public static void main(String[] args) - { + public static void main(String[] args) { junit.textui.TestRunner.run(suite()); } @@ -224,5 +212,6 @@ TestConfigUtil.testInit(); } - protected void tearDown() {} + protected void tearDown() { + } }
