Return-Path: Delivered-To: apmail-commons-commits-archive@locus.apache.org Received: (qmail 25370 invoked from network); 2 May 2008 17:47:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 May 2008 17:47:36 -0000 Received: (qmail 45789 invoked by uid 500); 2 May 2008 17:47:30 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 45722 invoked by uid 500); 2 May 2008 17:47:30 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 45699 invoked by uid 99); 2 May 2008 17:47:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 May 2008 10:47:30 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 May 2008 17:46:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 396E9238895D; Fri, 2 May 2008 10:46:57 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r652845 [1/4] - in /commons/proper/jxpath/trunk: ./ src/java/org/apache/commons/jxpath/ src/java/org/apache/commons/jxpath/functions/ src/java/org/apache/commons/jxpath/ri/ src/java/org/apache/commons/jxpath/ri/axes/ src/java/org/apache/com... Date: Fri, 02 May 2008 17:46:50 -0000 To: commits@commons.apache.org From: ebourg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080502174657.396E9238895D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ebourg Date: Fri May 2 10:46:46 2008 New Revision: 652845 URL: http://svn.apache.org/viewvc?rev=652845&view=rev Log: Improved the Javadoc: - added external links to JDOM, BeanUtils, and JEE - added @links in the class and method documentations to improve the navigation - removed the @inheritDoc with no additional comments Added line feeds at the end of the source files Removed the old constructors and the suite() methods from the JUnit tests Updated the relocated artifacts in the POM Downgraded the dependency on JUnit to 3.8.1 Added PMD to the reports Removed: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/JXPathTestSuite.java Modified: commons/proper/jxpath/trunk/checkstyle.xml commons/proper/jxpath/trunk/pom.xml commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/AbstractFactory.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/BasicNodeSet.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/BasicVariables.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ClassFunctions.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/CompiledExpression.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Container.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/DynamicPropertyHandler.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ExtendedKeyManager.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Function.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/FunctionLibrary.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Functions.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/IdentityManager.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathAbstractFactoryException.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathBasicBeanInfo.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathBeanInfo.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContext.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContextFactory.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContextFactoryConfigurationError.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathIntrospector.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathInvalidAccessException.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/KeyManager.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/MapDynamicPropertyHandler.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/PackageFunctions.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Pointer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Variables.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/XMLDocumentContainer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/functions/ConstructorFunction.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/functions/MethodFunction.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/Compiler.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/EvalContext.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/InfoSetUtil.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/JXPathCompiledExpression.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/JXPathContextFactoryReferenceImpl.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/NamespaceResolver.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/Parser.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/QName.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/AncestorContext.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/AttributeContext.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/ChildContext.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/DescendantContext.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/InitialContext.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/NamespaceContext.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/NodeSetContext.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/ParentContext.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/PrecedingOrFollowingContext.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/PredicateContext.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/RootContext.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/SelfContext.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreter.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/UnionContext.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/Constant.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/CoreFunction.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/CoreOperation.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/CoreOperationAdd.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/CoreOperationAnd.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/CoreOperationCompare.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/CoreOperationDivide.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/CoreOperationEqual.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/CoreOperationGreaterThan.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/CoreOperationGreaterThanOrEqual.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/CoreOperationLessThan.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/CoreOperationLessThanOrEqual.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/CoreOperationMod.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/CoreOperationMultiply.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/CoreOperationNegate.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/CoreOperationNotEqual.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/CoreOperationOr.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/CoreOperationRelationalExpression.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/CoreOperationSubtract.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/CoreOperationUnion.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/Expression.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/ExpressionPath.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/ExtensionFunction.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/LocationPath.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/NameAttributeTest.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/NodeNameTest.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/NodeTest.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/NodeTypeTest.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/Operation.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/Path.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/ProcessingInstructionTest.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/Step.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/TreeCompiler.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/VariableReference.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/NodeIterator.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/NodePointer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/NodePointerFactory.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/VariablePointer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/VariablePointerFactory.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/BeanAttributeIterator.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/BeanPointer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/BeanPointerFactory.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/BeanPropertyPointer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/CollectionAttributeNodeIterator.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/CollectionChildNodeIterator.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/CollectionNodeIterator.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/CollectionPointer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/CollectionPointerFactory.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/LangAttributePointer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/NullElementPointer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/NullPointer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/NullPropertyPointer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyIterator.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyOwnerPointer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyPointer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/container/ContainerPointer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/container/ContainerPointerFactory.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributeIterator.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributePointer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNamespaceIterator.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodeIterator.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMPointerFactory.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/NamespacePointer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPointer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPointerFactory.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPropertyPointer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicAttributeIterator.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPointer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPointerFactory.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPropertyPointer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributeIterator.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributePointer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNamespaceIterator.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNamespacePointer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodeIterator.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMPointerFactory.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/Constants.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/HttpSessionHandler.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/JXPathServletContexts.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/KeywordVariables.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/PageContextHandler.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/PageScopeContext.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/PageScopeContextHandler.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletContextHandler.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletRequestAndContext.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletRequestHandler.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/BasicTypeConverter.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/JXPath11CompatibleTypeConverter.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/KeyManagerUtils.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/MethodLookupUtils.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/ReverseComparator.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/TypeConverter.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/TypeUtils.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/ValueUtils.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/DOMParser.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/DocumentContainer.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/JDOMParser.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/XMLParser.java commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/XMLParser2.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/BasicNodeSetTest.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/JXPathTestCase.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/JXPathCompiledExpressionTest.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/StressTest.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/axes/RecursiveAxesTest.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/axes/SimplePathInterpreterTest.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/ContextDependencyTest.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/CoreFunctionTest.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/CoreOperationTest.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/ExtensionFunctionTest.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/VariableTest.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/BeanModelTestCase.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/EmbeddedColonMapKeysTest.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/EmptyCollectionTest.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/ExternalXMLNamespaceTest.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/MixedModelTest.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/XMLModelTestCase.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/XMLPreserveSpaceTest.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/XMLSpaceTest.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/beans/BadlyImplementedFactoryTest.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/beans/BeanModelTest.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/container/ContainerModelTest.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/dom/DOMModelTest.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanModelTest.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/dynamic/DynamicPropertiesModelTest.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/util/BasicTypeConverterTest.java Modified: commons/proper/jxpath/trunk/checkstyle.xml URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/checkstyle.xml?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/checkstyle.xml (original) +++ commons/proper/jxpath/trunk/checkstyle.xml Fri May 2 10:46:46 2008 @@ -31,7 +31,7 @@ - + @@ -72,6 +72,7 @@ + Modified: commons/proper/jxpath/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/pom.xml?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/pom.xml (original) +++ commons/proper/jxpath/trunk/pom.xml Fri May 2 10:46:46 2008 @@ -111,19 +111,19 @@ xerces - xerces + xercesImpl 2.4.0 true - servletapi - servletapi + javax.servlet + servlet-api 2.4 provided true - jspapi + javax.servlet jsp-api 2.0 provided @@ -132,7 +132,7 @@ junit junit - 3.8.2 + 3.8.1 test @@ -179,11 +179,24 @@ org.apache.maven.plugins + maven-pmd-plugin + + 1.3 + + **/parser/* + + + + + org.apache.maven.plugins maven-javadoc-plugin true http://java.sun.com/j2se/1.3/docs/api/ + http://java.sun.com/javaee/5/docs/api/ + http://commons.apache.org/beanutils/apidocs/ + http://www.jdom.org/docs/apidocs/ Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/AbstractFactory.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/AbstractFactory.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/AbstractFactory.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/AbstractFactory.java Fri May 2 10:46:46 2008 @@ -69,4 +69,4 @@ public boolean declareVariable(JXPathContext context, String name) { return false; } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/BasicNodeSet.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/BasicNodeSet.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/BasicNodeSet.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/BasicNodeSet.java Fri May 2 10:46:46 2008 @@ -21,7 +21,9 @@ import java.util.List; /** - * A simple implementation of NodeSet that behaves as a collection of pointers. + * A simple implementation of {@link NodeSet} that behaves as a collection + * of pointers. + * * @author Dmitri Plotnikov * @version $Revision$ $Date$ */ @@ -61,9 +63,6 @@ } } - /** - * {@inheritDoc} - */ public synchronized List getPointers() { if (readOnlyPointers == null) { readOnlyPointers = Collections.unmodifiableList(pointers); @@ -71,9 +70,6 @@ return readOnlyPointers; } - /** - * {@inheritDoc} - */ public synchronized List getNodes() { if (nodes == null) { nodes = new ArrayList(); @@ -86,9 +82,6 @@ return nodes; } - /** - * {@inheritDoc} - */ public synchronized List getValues() { if (values == null) { values = new ArrayList(); @@ -101,9 +94,6 @@ return values; } - /** - * {@inheritDoc} - */ public String toString() { return pointers.toString(); } Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/BasicVariables.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/BasicVariables.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/BasicVariables.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/BasicVariables.java Fri May 2 10:46:46 2008 @@ -82,10 +82,7 @@ vars.remove(varName); } - /** - * {@inheritDoc} - */ public String toString() { return vars.toString(); } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ClassFunctions.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ClassFunctions.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ClassFunctions.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ClassFunctions.java Fri May 2 10:46:46 2008 @@ -44,7 +44,7 @@ * * *

- * If the first argument of a method is ExpressionContext, the + * If the first argument of a method is {@link ExpressionContext}, the * expression context in which the function is evaluated is passed to * the method. * @@ -77,7 +77,7 @@ } /** - * Returns a Function, if any, for the specified namespace, + * Returns a {@link Function}, if any, for the specified namespace, * name and parameter types. * * @param namespace if it is not the namespace specified in the constructor, Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/CompiledExpression.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/CompiledExpression.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/CompiledExpression.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/CompiledExpression.java Fri May 2 10:46:46 2008 @@ -21,7 +21,7 @@ /** * Represents a compiled XPath. The interpretation of compiled XPaths * may be faster, because it bypasses the compilation step. The reference - * implementation of JXPathContext also globally caches some of the + * implementation of {@link JXPathContext} also globally caches some of the * results of compilation, so the direct use of JXPathContext is not * always less efficient than the use of CompiledExpression. *

@@ -29,7 +29,7 @@ * same expression multiple times and the CompiledExpression can be * conveniently cached. *

- * To acqure a CompiledExpression, call {@link JXPathContext#compile + * To acquire a CompiledExpression, call {@link JXPathContext#compile * JXPathContext.compile} * * @author Dmitri Plotnikov @@ -68,8 +68,8 @@ /** * Creates intermediate elements of - * the path by invoking an AbstractFactory, which should first be - * installed on the context by calling "setFactory". + * the path by invoking an {@link AbstractFactory}, which should first be + * installed on the context by calling {@link JXPathContext#setFactory}. * @param context base * @return Pointer created */ @@ -77,8 +77,8 @@ /** * The same as setValue, except it creates intermediate elements of - * the path by invoking an AbstractFactory, which should first be - * installed on the context by calling "setFactory". + * the path by invoking an {@link AbstractFactory}, which should first be + * installed on the context by calling {@link JXPathContext#setFactory}. *

* Will throw an exception if one of the following conditions occurs: *

    Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Container.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Container.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Container.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Container.java Fri May 2 10:46:46 2008 @@ -40,4 +40,4 @@ * @param value Object value to set. */ void setValue(Object value); -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/DynamicPropertyHandler.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/DynamicPropertyHandler.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/DynamicPropertyHandler.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/DynamicPropertyHandler.java Fri May 2 10:46:46 2008 @@ -61,4 +61,4 @@ * @param value to set */ void setProperty(Object object, String propertyName, Object value); -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ExtendedKeyManager.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ExtendedKeyManager.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ExtendedKeyManager.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ExtendedKeyManager.java Fri May 2 10:46:46 2008 @@ -37,4 +37,4 @@ */ NodeSet getNodeSetByKey(JXPathContext context, String key, Object value); -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Function.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Function.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Function.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Function.java Fri May 2 10:46:46 2008 @@ -44,4 +44,4 @@ * @return Object result */ Object invoke(ExpressionContext context, Object[] parameters); -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/FunctionLibrary.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/FunctionLibrary.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/FunctionLibrary.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/FunctionLibrary.java Fri May 2 10:46:46 2008 @@ -23,9 +23,9 @@ import java.util.Set; /** - * An object that aggregates Functions objects into a group Functions object. - * Since JXPathContext can only register a single Functions object, - * FunctionLibrary should always be used to group all Functions objects + * An object that aggregates {@link Functions} objects into a group Functions + * object. Since {@link JXPathContext} can only register a single Functions + * object, FunctionLibrary should always be used to group all Functions objects * that need to be registered. * * @author Dmitri Plotnikov @@ -129,4 +129,4 @@ } } } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Functions.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Functions.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Functions.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Functions.java Fri May 2 10:46:46 2008 @@ -46,4 +46,4 @@ * @return Function */ Function getFunction(String namespace, String name, Object[] parameters); -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/IdentityManager.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/IdentityManager.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/IdentityManager.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/IdentityManager.java Fri May 2 10:46:46 2008 @@ -17,7 +17,7 @@ package org.apache.commons.jxpath; /** - * A delegate of JXPathContext that implements the XPath "id()" + * A delegate of {@link JXPathContext} that implements the XPath "id()" * function. This delegate is only used when there is no default implementation * of the id() function. For example, it is not used * when the root of the context is a DOM Node. @@ -34,4 +34,4 @@ * @return Pointer */ Pointer getPointerByID(JXPathContext context, String id); -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathAbstractFactoryException.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathAbstractFactoryException.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathAbstractFactoryException.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathAbstractFactoryException.java Fri May 2 10:46:46 2008 @@ -17,8 +17,8 @@ package org.apache.commons.jxpath; /** - * Thrown when an AbstractFactory cannot generate an object for the requested - * path. + * Thrown when an {@link AbstractFactory} cannot generate an object for + * the requested path. * * @author Dmitri Plotnikov * @version $Revision: 155422 $ $Date: 2005-02-26 08:07:46 -0500 (Sat, 26 Feb 2005) $ Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathBasicBeanInfo.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathBasicBeanInfo.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathBasicBeanInfo.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathBasicBeanInfo.java Fri May 2 10:46:46 2008 @@ -29,7 +29,8 @@ * advertised by JXPathBasicBeanInfo are the same as those advertised by * BeanInfo for the corresponding class. * - * See java.beans.BeanInfo, java.beans.Introspector + * @see java.beans.BeanInfo + * @see java.beans.Introspector * * @author Dmitri Plotnikov * @version $Revision$ $Date$ @@ -88,9 +89,6 @@ return dynamicPropertyHandlerClass != null; } - /** - * {@inheritDoc} - */ public synchronized PropertyDescriptor[] getPropertyDescriptors() { if (propertyDescriptors == null) { if (clazz == Object.class) { @@ -124,9 +122,6 @@ return propertyDescriptors; } - /** - * {@inheritDoc} - */ public synchronized PropertyDescriptor getPropertyDescriptor(String propertyName) { if (propertyDescriptorMap == null) { propertyDescriptorMap = new HashMap(); @@ -147,9 +142,6 @@ return dynamicPropertyHandlerClass; } - /** - * {@inheritDoc} - */ public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("BeanInfo [class = "); @@ -171,4 +163,4 @@ buffer.append("]"); return buffer.toString(); } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathBeanInfo.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathBeanInfo.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathBeanInfo.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathBeanInfo.java Fri May 2 10:46:46 2008 @@ -19,7 +19,7 @@ import java.beans.PropertyDescriptor; /** - * JXPathBeanInfo is similar to java.beans.BeanInfo in that it describes + * JXPathBeanInfo is similar to {@link java.beans.BeanInfo} in that it describes * properties of a JavaBean class. By default, JXPathBeanInfo classes are * automatically generated by {@link JXPathIntrospector JXPathIntrospector} * based on the java.beans.BeanInfo. As with JavaBeans, the user can supply an @@ -38,15 +38,15 @@ /** * Returns true if objects of this class are treated as atomic * objects which have no properties of their own. - * For example, java.lang.String and java.lang.Number are atomic. + * For example, {@link String} and {@link Number} are atomic. * @return boolean */ boolean isAtomic(); /** * Returns true if the objects of this class have dynamic properties - * (e.g. java.util.Map). If this method returns true, getPropertyDescriptors - * should return null and getDynamicPropertyHandlerClass should return + * (e.g. java.util.Map). If this method returns true, {@link #getPropertyDescriptors} + * should return null and {@link #getDynamicPropertyHandlerClass} should return * a valid class name. An object cannot have both static and dynamic * properties at the same time. * @return boolean @@ -70,9 +70,9 @@ /** * For dynamic objects, returns the class implementing - * the DynamicPropertyHandler interface. That class can + * the {@link DynamicPropertyHandler} interface. That class can * be used to access dynamic properties. * @return Class */ Class getDynamicPropertyHandlerClass(); -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContext.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContext.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContext.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContext.java Fri May 2 10:46:46 2008 @@ -34,8 +34,8 @@ * JXPathContext allows alternative implementations. This is why instead of * allocating JXPathContext directly, you should call a static * newContext method. This method will utilize the - * JXPathContextFactory API to locate a suitable implementation of JXPath. - * Bundled with JXPath comes a default implementation called Reference + * {@link JXPathContextFactory} API to locate a suitable implementation of + * JXPath. Bundled with JXPath comes a default implementation called Reference * Implementation. *

    * @@ -494,7 +494,7 @@ /** * Returns the variable pool associated with the context. If no such - * pool was specified with the setVariables() method, + * pool was specified with the {@link #setVariables} method, * returns the default implementation of Variables, * {@link BasicVariables BasicVariables}. * @return Variables @@ -580,8 +580,8 @@ } /** - * Sets DecimalFormatSymbols for a given name. The DecimalFormatSymbols can - * be referenced as the third, optional argument in the invocation of + * Sets {@link DecimalFormatSymbols} for a given name. The DecimalFormatSymbols + * can be referenced as the third, optional argument in the invocation of * format-number (number,format,decimal-format-name) function. * By default, JXPath uses the symbols for the current locale. * @@ -721,8 +721,8 @@ public abstract void setValue(String xpath, Object value); /** - * Creates missing elements of the path by invoking an AbstractFactory, - * which should first be installed on the context by calling "setFactory". + * Creates missing elements of the path by invoking an {@link AbstractFactory}, + * which should first be installed on the context by calling {@link #setFactory}. *

    * Will throw an exception if the AbstractFactory fails to create * an instance for a path element. @@ -733,8 +733,8 @@ /** * The same as setValue, except it creates intermediate elements of - * the path by invoking an AbstractFactory, which should first be - * installed on the context by calling "setFactory". + * the path by invoking an {@link AbstractFactory}, which should first be + * installed on the context by calling {@link #setFactory}. *

    * Will throw an exception if one of the following conditions occurs: *

      @@ -944,4 +944,4 @@ "Namespace registration is not implemented by " + getClass()); } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContextFactory.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContextFactory.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContextFactory.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContextFactory.java Fri May 2 10:46:46 2008 @@ -25,10 +25,10 @@ /** * Defines a factory API that enables applications to obtain a - * JXPathContext instance. To acquire a JXPathContext, first call the - * static newInstance() method of JXPathContextFactory. + * {@link JXPathContext} instance. To acquire a JXPathContext, first call the + * static {@link #newInstance} method of JXPathContextFactory. * This method returns a concrete JXPathContextFactory. - * Then call newContext() on that instance. You will rarely + * Then call {@link #newContext} on that instance. You will rarely * need to perform these steps explicitly: usually you can call one of the * JXPathContex.newContext methods, which will perform these steps * for you. @@ -245,4 +245,4 @@ return defaultFactory; } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContextFactoryConfigurationError.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContextFactoryConfigurationError.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContextFactoryConfigurationError.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContextFactoryConfigurationError.java Fri May 2 10:46:46 2008 @@ -17,7 +17,7 @@ package org.apache.commons.jxpath; /** - * Thrown when a problem with configuration with the JXPathContextFactories + * Thrown when a problem with configuration with the {@link JXPathContextFactory JXPathContextFactories} * exists. This error will typically be thrown when the class of a * factory specified in the system properties cannot be found * or instantiated. @@ -25,7 +25,6 @@ * @author Dmitri Plotnikov * @version $Revision$ $Date$ */ - public class JXPathContextFactoryConfigurationError extends Error { /** @serial */ @@ -35,7 +34,6 @@ * Create a new JXPathContextFactoryConfigurationError with no * detail mesage. */ - public JXPathContextFactoryConfigurationError() { super(); this.exception = null; @@ -47,7 +45,6 @@ * * @param msg The error message for the exception. */ - public JXPathContextFactoryConfigurationError(String msg) { super(msg); this.exception = null; @@ -61,7 +58,6 @@ * @param e The exception to be encapsulated in a * JXPathContextFactoryConfigurationError. */ - public JXPathContextFactoryConfigurationError(Exception e) { super(e.toString()); this.exception = e; @@ -75,7 +71,6 @@ * JXPathContextFactoryConfigurationError * @param msg The detail message. */ - public JXPathContextFactoryConfigurationError(Exception e, String msg) { super(msg); this.exception = e; @@ -89,7 +84,6 @@ * * @return The error message. */ - public String getMessage () { String message = super.getMessage(); if (message == null && exception != null) { @@ -104,8 +98,7 @@ * * @return The encapsulated exception, or null if there is none. */ - public Exception getException () { return exception; } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathIntrospector.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathIntrospector.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathIntrospector.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathIntrospector.java Fri May 2 10:46:46 2008 @@ -69,8 +69,10 @@ } /** - * Automatically creates and registers a JXPathBeanInfo object - * for the specified class. That object returns true to isDynamic(). + * Automatically creates and registers a {@link JXPathBeanInfo} object + * for the specified class. That object returns true to + * {@link JXPathBeanInfo#isDynamic()}. + * * @param beanClass to register * @param dynamicPropertyHandlerClass to handle beanClass */ @@ -211,4 +213,4 @@ Class cls = Class.forName(className); return cls.newInstance(); } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathInvalidAccessException.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathInvalidAccessException.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathInvalidAccessException.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathInvalidAccessException.java Fri May 2 10:46:46 2008 @@ -17,8 +17,9 @@ package org.apache.commons.jxpath; /** - * Similary to InvocationTargetException in that it is thrown when - * JXPath cannot access properties, collection etc on the target object model. + * Similary to {@link java.lang.reflect.InvocationTargetException} in that + * it is thrown when JXPath cannot access properties, collection etc on the + * target object model. * * @author Dmitri Plotnikov * @version $Revision: 155422 $ $Date: 2005-02-26 08:07:46 -0500 (Sat, 26 Feb 2005) $ Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/KeyManager.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/KeyManager.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/KeyManager.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/KeyManager.java Fri May 2 10:46:46 2008 @@ -17,7 +17,7 @@ package org.apache.commons.jxpath; /** - * A delegate of JXPathContext that implements the XPath "key()" + * A delegate of {@link JXPathContext} that implements the XPath "key()" * function. * * @author Dmitri Plotnikov @@ -27,6 +27,7 @@ /** * Find a node by key/value. + * * @param context to search * @param keyName String * @param keyValue String @@ -36,4 +37,4 @@ JXPathContext context, String keyName, String keyValue); -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/MapDynamicPropertyHandler.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/MapDynamicPropertyHandler.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/MapDynamicPropertyHandler.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/MapDynamicPropertyHandler.java Fri May 2 10:46:46 2008 @@ -21,16 +21,13 @@ import java.util.Set; /** - * Implements the DynamicPropertyHandler interface for java.util.Map. + * Implements the DynamicPropertyHandler interface for {@link java.util.Map}. * * @author Dmitri Plotnikov * @version $Revision$ $Date$ */ public class MapDynamicPropertyHandler implements DynamicPropertyHandler { - /** - * {@inheritDoc} - */ public String[] getPropertyNames(Object object) { Map map = (Map) object; Set set = map.keySet(); @@ -42,17 +39,11 @@ return names; } - /** - * {@inheritDoc} - */ public Object getProperty(Object object, String propertyName) { return ((Map) object).get(propertyName); } - /** - * {@inheritDoc} - */ public void setProperty(Object object, String propertyName, Object value) { ((Map) object).put(propertyName, value); } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/PackageFunctions.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/PackageFunctions.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/PackageFunctions.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/PackageFunctions.java Fri May 2 10:46:46 2008 @@ -52,8 +52,8 @@ * * *

      - * If the first argument of a method or constructor is ExpressionContext, the - * expression context in which the function is evaluated is passed to + * If the first argument of a method or constructor is {@link ExpressionContext}, + * the expression context in which the function is evaluated is passed to * the method. *

      *

      @@ -91,7 +91,7 @@ } /** - * Returns a Function, if found, for the specified namespace, + * Returns a {@link Function}, if found, for the specified namespace, * name and parameter types. *

      * @param namespace - if it is not the same as specified in the @@ -213,4 +213,4 @@ } return null; } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Pointer.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Pointer.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Pointer.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Pointer.java Fri May 2 10:46:46 2008 @@ -93,4 +93,4 @@ * @return cloned Object */ Object clone(); -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Variables.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Variables.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Variables.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/Variables.java Fri May 2 10:46:46 2008 @@ -57,4 +57,4 @@ * @param varName is a variable name without the "$" sign */ void undeclareVariable(String varName); -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/XMLDocumentContainer.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/XMLDocumentContainer.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/XMLDocumentContainer.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/XMLDocumentContainer.java Fri May 2 10:46:46 2008 @@ -36,7 +36,7 @@ * read, parsed and traversed. If they are not - they won't be * read at all. * - * @deprecated 1.1 Please use org.apache.commons.jxpath.xml.DocumentContainer + * @deprecated 1.1 Please use {@link DocumentContainer} * * @author Dmitri Plotnikov * @version $Revision$ $Date$ Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/functions/ConstructorFunction.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/functions/ConstructorFunction.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/functions/ConstructorFunction.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/functions/ConstructorFunction.java Fri May 2 10:46:46 2008 @@ -79,4 +79,4 @@ ex); } } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/functions/MethodFunction.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/functions/MethodFunction.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/functions/MethodFunction.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/functions/MethodFunction.java Fri May 2 10:46:46 2008 @@ -45,9 +45,6 @@ this.method = ValueUtils.getAccessibleMethod(method); } - /** - * {@inheritDoc} - */ public Object invoke(ExpressionContext context, Object[] parameters) { try { Object target; @@ -104,10 +101,7 @@ } } - /** - * {@inheritDoc} - */ public String toString() { return method.toString(); } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/Compiler.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/Compiler.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/Compiler.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/Compiler.java Fri May 2 10:46:46 2008 @@ -344,4 +344,4 @@ Object expression, Object[] predicates, Object[] steps); -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/EvalContext.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/EvalContext.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/EvalContext.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/EvalContext.java Fri May 2 10:46:46 2008 @@ -66,23 +66,14 @@ this.parentContext = parentContext; } - /** - * {@inheritDoc} - */ public Pointer getContextNodePointer() { return getCurrentNodePointer(); } - /** - * {@inheritDoc} - */ public JXPathContext getJXPathContext() { return getRootContext().getJXPathContext(); } - /** - * {@inheritDoc} - */ public int getPosition() { return position; } @@ -277,9 +268,6 @@ return getNodeSet(); } - /** - * {@inheritDoc} - */ public String toString() { Pointer ptr = getContextNodePointer(); return ptr == null ? "Empty expression context" : "Expression context [" + getPosition() @@ -391,4 +379,4 @@ this.position = position; return true; } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/InfoSetUtil.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/InfoSetUtil.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/InfoSetUtil.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/InfoSetUtil.java Fri May 2 10:46:46 2008 @@ -160,4 +160,4 @@ } return object != null; } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/JXPathCompiledExpression.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/JXPathCompiledExpression.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/JXPathCompiledExpression.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/JXPathCompiledExpression.java Fri May 2 10:46:46 2008 @@ -60,87 +60,54 @@ return expression; } - /** - * {@inheritDoc} - */ public String toString() { return xpath; } - /** - * {@inheritDoc} - */ public Object getValue(JXPathContext context) { return ((JXPathContextReferenceImpl) context). getValue(xpath, expression); } - /** - * {@inheritDoc} - */ public Object getValue(JXPathContext context, Class requiredType) { return ((JXPathContextReferenceImpl) context). getValue(xpath, expression, requiredType); } - /** - * {@inheritDoc} - */ public void setValue(JXPathContext context, Object value) { ((JXPathContextReferenceImpl) context). setValue(xpath, expression, value); } - /** - * {@inheritDoc} - */ public Pointer createPath(JXPathContext context) { return ((JXPathContextReferenceImpl) context). createPath(xpath, expression); } - /** - * {@inheritDoc} - */ public Pointer createPathAndSetValue(JXPathContext context, Object value) { return ((JXPathContextReferenceImpl) context). createPathAndSetValue(xpath, expression, value); } - /** - * {@inheritDoc} - */ public Iterator iterate(JXPathContext context) { return ((JXPathContextReferenceImpl) context). iterate(xpath, expression); } - /** - * {@inheritDoc} - */ public Pointer getPointer(JXPathContext context, String xpath) { return ((JXPathContextReferenceImpl) context). getPointer(xpath, expression); } - /** - * {@inheritDoc} - */ public Iterator iteratePointers(JXPathContext context) { return ((JXPathContextReferenceImpl) context). iteratePointers(xpath, expression); } - /** - * {@inheritDoc} - */ public void removePath(JXPathContext context) { ((JXPathContextReferenceImpl) context).removePath(xpath, expression); } - /** - * {@inheritDoc} - */ public void removeAll(JXPathContext context) { ((JXPathContextReferenceImpl) context).removeAll(xpath, expression); } Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/JXPathContextFactoryReferenceImpl.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/JXPathContextFactoryReferenceImpl.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/JXPathContextFactoryReferenceImpl.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/JXPathContextFactoryReferenceImpl.java Fri May 2 10:46:46 2008 @@ -33,12 +33,9 @@ public JXPathContextFactoryReferenceImpl() { } - /** - * {@inheritDoc} - */ public JXPathContext newContext( JXPathContext parentContext, Object contextBean) { return new JXPathContextReferenceImpl(parentContext, contextBean); } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java Fri May 2 10:46:46 2008 @@ -217,9 +217,6 @@ return COMPILER; } - /** - * {@inheritDoc} - */ protected CompiledExpression compilePath(String xpath) { return new JXPathCompiledExpression(xpath, compileExpression(xpath)); } @@ -453,9 +450,6 @@ return expr.iterate(getEvalContext()); } - /** - * {@inheritDoc} - */ public Pointer getPointer(String xpath) { return getPointer(xpath, compileExpression(xpath)); } @@ -481,9 +475,6 @@ return NodePointer.newNodePointer(null, result, getLocale()); } - /** - * {@inheritDoc} - */ public void setValue(String xpath, Object value) { setValue(xpath, compileExpression(xpath), value); } @@ -504,9 +495,6 @@ } } - /** - * {@inheritDoc} - */ public Pointer createPath(String xpath) { return createPath(xpath, compileExpression(xpath)); } @@ -543,9 +531,6 @@ } } - /** - * {@inheritDoc} - */ public Pointer createPathAndSetValue(String xpath, Object value) { return createPathAndSetValue(xpath, compileExpression(xpath), value); } @@ -646,9 +631,6 @@ return expr.iteratePointers(getEvalContext()); } - /** - * {@inheritDoc} - */ public void removePath(String xpath) { removePath(xpath, compileExpression(xpath)); } @@ -672,9 +654,6 @@ } } - /** - * {@inheritDoc} - */ public void removeAll(String xpath) { removeAll(xpath, compileExpression(xpath)); } @@ -708,9 +687,6 @@ } } - /** - * {@inheritDoc} - */ public JXPathContext getRelativeContext(Pointer pointer) { Object contextBean = pointer.getNode(); if (contextBean == null) { @@ -721,9 +697,6 @@ return new JXPathContextReferenceImpl(this, contextBean, pointer); } - /** - * {@inheritDoc} - */ public Pointer getContextPointer() { return contextPointer; } @@ -790,9 +763,6 @@ "Undefined function: " + functionName.toString()); } - /** - * {@inheritDoc} - */ public void registerNamespace(String prefix, String namespaceURI) { if (namespaceResolver.isSealed()) { namespaceResolver = (NamespaceResolver) namespaceResolver.clone(); @@ -800,9 +770,6 @@ namespaceResolver.registerNamespace(prefix, namespaceURI); } - /** - * {@inheritDoc} - */ public String getNamespaceURI(String prefix) { return namespaceResolver.getNamespaceURI(prefix); } @@ -815,9 +782,6 @@ return namespaceResolver.getPrefix(namespaceURI); } - /** - * {@inheritDoc} - */ public void setNamespaceContextPointer(Pointer pointer) { if (namespaceResolver.isSealed()) { namespaceResolver = (NamespaceResolver) namespaceResolver.clone(); @@ -825,9 +789,6 @@ namespaceResolver.setNamespaceContextPointer((NodePointer) pointer); } - /** - * {@inheritDoc} - */ public Pointer getNamespaceContextPointer() { return namespaceResolver.getNamespaceContextPointer(); } @@ -864,4 +825,4 @@ throw new JXPathException("Cannot allocate " + className, ex); } } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/NamespaceResolver.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/NamespaceResolver.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/NamespaceResolver.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/NamespaceResolver.java Fri May 2 10:46:46 2008 @@ -25,7 +25,7 @@ import org.apache.commons.jxpath.ri.model.NodePointer; /** - * Namespace resolver for JXPathContextReferenceImpl. + * Namespace resolver for {@link JXPathContextReferenceImpl}. * * @author Dmitri Plotnikov * @version $Revision$ $Date$ @@ -195,10 +195,6 @@ } } - /** - * {@inheritDoc} - * @see java.lang.Object#clone() - */ public Object clone() { try { NamespaceResolver result = (NamespaceResolver) super.clone(); @@ -211,5 +207,4 @@ return null; } } - -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/Parser.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/Parser.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/Parser.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/Parser.java Fri May 2 10:46:46 2008 @@ -98,4 +98,4 @@ // Piggy-back on the code generated by JavaCC return TokenMgrError.addEscapes(string); } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/QName.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/QName.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/QName.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/QName.java Fri May 2 10:46:46 2008 @@ -67,23 +67,14 @@ return name; } - /** - * {@inheritDoc} - */ public String toString() { return qualifiedName; } - /** - * {@inheritDoc} - */ public int hashCode() { return name.hashCode(); } - /** - * {@inheritDoc} - */ public boolean equals(Object object) { if (this == object) { return true; @@ -93,4 +84,4 @@ } return qualifiedName.equals(((QName) object).qualifiedName); } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/AncestorContext.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/AncestorContext.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/AncestorContext.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/AncestorContext.java Fri May 2 10:46:46 2008 @@ -48,31 +48,19 @@ this.nodeTest = nodeTest; } - /** - * {@inheritDoc} - */ public NodePointer getCurrentNodePointer() { return currentNodePointer; } - /** - * {@inheritDoc} - */ public int getDocumentOrder() { return -1; } - /** - * {@inheritDoc} - */ public void reset() { super.reset(); setStarted = false; } - /** - * {@inheritDoc} - */ public boolean setPosition(int position) { if (position < getCurrentPosition()) { reset(); @@ -86,18 +74,13 @@ return true; } - /** - * {@inheritDoc} - */ public boolean nextNode() { if (!setStarted) { setStarted = true; currentNodePointer = parentContext.getCurrentNodePointer(); - if (includeSelf) { - if (currentNodePointer.testNode(nodeTest)) { - position++; - return true; - } + if (includeSelf && currentNodePointer.testNode(nodeTest)) { + position++; + return true; } } @@ -114,4 +97,4 @@ } } } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/AttributeContext.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/AttributeContext.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/AttributeContext.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/AttributeContext.java Fri May 2 10:46:46 2008 @@ -49,25 +49,16 @@ this.nodeTest = nodeTest; } - /** - * {@inheritDoc} - */ public NodePointer getCurrentNodePointer() { return currentNodePointer; } - /** - * {@inheritDoc} - */ public void reset() { setStarted = false; iterator = null; super.reset(); } - /** - * {@inheritDoc} - */ public boolean setPosition(int position) { if (position < getCurrentPosition()) { reset(); @@ -81,9 +72,6 @@ return true; } - /** - * {@inheritDoc} - */ public boolean nextNode() { super.setPosition(getCurrentPosition() + 1); if (!setStarted) { @@ -114,4 +102,4 @@ currentNodePointer = iterator.getNodePointer(); return true; } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/ChildContext.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/ChildContext.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/ChildContext.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/ChildContext.java Fri May 2 10:46:46 2008 @@ -50,14 +50,9 @@ this.reverse = reverse; } - /** - * {@inheritDoc} - */ public NodePointer getCurrentNodePointer() { - if (position == 0) { - if (!setPosition(1)) { - return null; - } + if (position == 0 && !setPosition(1)) { + return null; } return iterator == null ? null : iterator.getNodePointer(); } @@ -88,24 +83,15 @@ return getCurrentNodePointer(); } - /** - * {@inheritDoc} - */ public boolean nextNode() { return setPosition(getCurrentPosition() + 1); } - /** - * {@inheritDoc} - */ public void reset() { super.reset(); iterator = null; } - /** - * {@inheritDoc} - */ public boolean setPosition(int position) { int oldPosition = getCurrentPosition(); super.setPosition(position); @@ -127,4 +113,4 @@ iterator = parent == null ? null : useParent.childIterator(nodeTest, reverse, startFromParentLocation ? parent : null); } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/DescendantContext.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/DescendantContext.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/DescendantContext.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/DescendantContext.java Fri May 2 10:46:46 2008 @@ -55,36 +55,22 @@ this.nodeTest = nodeTest; } - /** - * {@inheritDoc} - */ public boolean isChildOrderingRequired() { return true; } - /** - * {@inheritDoc} - */ public NodePointer getCurrentNodePointer() { - if (position == 0) { - if (!setPosition(1)) { - return null; - } + if (position == 0 && !setPosition(1)) { + return null; } return currentNodePointer; } - /** - * {@inheritDoc} - */ public void reset() { super.reset(); setStarted = false; } - /** - * {@inheritDoc} - */ public boolean setPosition(int position) { if (position < this.position) { reset(); @@ -98,9 +84,6 @@ return true; } - /** - * {@inheritDoc} - */ public boolean nextNode() { if (!setStarted) { setStarted = true; @@ -114,11 +97,9 @@ false, null)); } - if (includeSelf) { - if (currentNodePointer.testNode(nodeTest)) { - position++; - return true; - } + if (includeSelf && currentNodePointer.testNode(nodeTest)) { + position++; + return true; } } } @@ -166,4 +147,4 @@ } return false; } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/InitialContext.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/InitialContext.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/InitialContext.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/InitialContext.java Fri May 2 10:46:46 2008 @@ -47,37 +47,22 @@ } } - /** - * {@inheritDoc} - */ public Pointer getSingleNodePointer() { return nodePointer; } - /** - * {@inheritDoc} - */ public NodePointer getCurrentNodePointer() { return nodePointer; } - /** - * {@inheritDoc} - */ public Object getValue() { return nodePointer.getValue(); } - /** - * {@inheritDoc} - */ public boolean nextNode() { return setPosition(position + 1); } - /** - * {@inheritDoc} - */ public boolean setPosition(int position) { this.position = position; if (collection) { @@ -90,9 +75,6 @@ return position == 1; } - /** - * {@inheritDoc} - */ public boolean nextSet() { if (started) { return false; @@ -100,4 +82,4 @@ started = true; return true; } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/NamespaceContext.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/NamespaceContext.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/NamespaceContext.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/NamespaceContext.java Fri May 2 10:46:46 2008 @@ -44,25 +44,16 @@ this.nodeTest = nodeTest; } - /** - * {@inheritDoc} - */ public NodePointer getCurrentNodePointer() { return currentNodePointer; } - /** - * {@inheritDoc} - */ public void reset() { setStarted = false; iterator = null; super.reset(); } - /** - * {@inheritDoc} - */ public boolean setPosition(int position) { if (position < getCurrentPosition()) { reset(); @@ -76,9 +67,6 @@ return true; } - /** - * {@inheritDoc} - */ public boolean nextNode() { super.setPosition(getCurrentPosition() + 1); if (!setStarted) { @@ -113,4 +101,4 @@ currentNodePointer = iterator.getNodePointer(); return true; } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/NodeSetContext.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/NodeSetContext.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/NodeSetContext.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/NodeSetContext.java Fri May 2 10:46:46 2008 @@ -21,7 +21,7 @@ import org.apache.commons.jxpath.ri.model.NodePointer; /** - * A simple context that is based on a NodeSet. + * A simple context that is based on a {@link NodeSet}. * * @author Dmitri Plotnikov * @version $Revision$ $Date$ @@ -40,36 +40,22 @@ this.nodeSet = nodeSet; } - /** - * {@inheritDoc} - */ public NodeSet getNodeSet() { return nodeSet; } - /** - * {@inheritDoc} - */ public NodePointer getCurrentNodePointer() { - if (position == 0) { - if (!setPosition(1)) { - return null; - } + if (position == 0 && !setPosition(1)) { + return null; } return (NodePointer) nodeSet.getPointers().get(position - 1); } - /** - * {@inheritDoc} - */ public boolean setPosition(int position) { super.setPosition(position); return position >= 1 && position <= nodeSet.getPointers().size(); } - /** - * {@inheritDoc} - */ public boolean nextSet() { if (startedSet) { return false; @@ -78,10 +64,7 @@ return true; } - /** - * {@inheritDoc} - */ public boolean nextNode() { return setPosition(position + 1); } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/ParentContext.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/ParentContext.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/ParentContext.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/ParentContext.java Fri May 2 10:46:46 2008 @@ -41,46 +41,28 @@ this.nodeTest = nodeTest; } - /** - * {@inheritDoc} - */ public NodePointer getCurrentNodePointer() { return currentNodePointer; } - /** - * {@inheritDoc} - */ public int getCurrentPosition() { return 1; } - /** - * {@inheritDoc} - */ public int getDocumentOrder() { return -1; } - /** - * {@inheritDoc} - */ public void reset() { super.reset(); setStarted = false; } - /** - * {@inheritDoc} - */ public boolean setPosition(int position) { super.setPosition(position); return position == 1; } - /** - * {@inheritDoc} - */ public boolean nextNode() { // Each set contains exactly one node: the parent if (setStarted) { @@ -100,4 +82,4 @@ } return false; } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/PrecedingOrFollowingContext.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/PrecedingOrFollowingContext.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/PrecedingOrFollowingContext.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/PrecedingOrFollowingContext.java Fri May 2 10:46:46 2008 @@ -52,32 +52,20 @@ this.reverse = reverse; } - /** - * {@inheritDoc} - */ public NodePointer getCurrentNodePointer() { return currentNodePointer; } - /** - * {@inheritDoc} - */ public int getDocumentOrder() { return reverse ? -1 : 1; } - /** - * {@inheritDoc} - */ public void reset() { super.reset(); stack = new Stack(); setStarted = false; } - /** - * {@inheritDoc} - */ public boolean setPosition(int position) { if (position < this.position) { reset(); @@ -91,9 +79,6 @@ return true; } - /** - * {@inheritDoc} - */ public boolean nextNode() { if (!setStarted) { setStarted = true; @@ -180,4 +165,4 @@ } return false; } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/PredicateContext.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/PredicateContext.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/PredicateContext.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/PredicateContext.java Fri May 2 10:46:46 2008 @@ -52,9 +52,6 @@ } } - /** - * {@inheritDoc} - */ public boolean nextNode() { if (done) { return false; @@ -139,18 +136,13 @@ return true; } - /** - * {@inheritDoc} - */ public boolean setPosition(int position) { if (nameTestExpression == null) { return setPositionStandard(position); } else { - if (dynamicPropertyPointer == null) { - if (!setupDynamicPropertyPointer()) { - return setPositionStandard(position); - } + if (dynamicPropertyPointer == null && !setupDynamicPropertyPointer()) { + return setPositionStandard(position); } if (position < 1 || position > dynamicPropertyPointer.getLength()) { @@ -161,14 +153,9 @@ } } - /** - * {@inheritDoc} - */ public NodePointer getCurrentNodePointer() { - if (position == 0) { - if (!setPosition(1)) { - return null; - } + if (position == 0 && !setPosition(1)) { + return null; } if (dynamicPropertyPointer != null) { return dynamicPropertyPointer.getValuePointer(); @@ -176,18 +163,12 @@ return parentContext.getCurrentNodePointer(); } - /** - * {@inheritDoc} - */ public void reset() { super.reset(); parentContext.reset(); done = false; } - /** - * {@inheritDoc} - */ public boolean nextSet() { reset(); return parentContext.nextSet(); @@ -210,4 +191,4 @@ } return true; } -} \ No newline at end of file +} Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/RootContext.java URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/RootContext.java?rev=652845&r1=652844&r2=652845&view=diff ============================================================================== --- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/RootContext.java (original) +++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/RootContext.java Fri May 2 10:46:46 2008 @@ -53,16 +53,10 @@ } } - /** - * {@inheritDoc} - */ public JXPathContext getJXPathContext() { return jxpathContext; } - /** - * {@inheritDoc} - */ public RootContext getRootContext() { return this; } @@ -75,44 +69,26 @@ return jxpathContext.getAbsoluteRootContext(); } - /** - * {@inheritDoc} - */ public NodePointer getCurrentNodePointer() { return pointer; } - /** - * {@inheritDoc} - */ public Object getValue() { return pointer; } - /** - * {@inheritDoc} - */ public int getCurrentPosition() { throw new UnsupportedOperationException(); } - /** - * {@inheritDoc} - */ public boolean nextNode() { throw new UnsupportedOperationException(); } - /** - * {@inheritDoc} - */ public boolean nextSet() { throw new UnsupportedOperationException(); } - /** - * {@inheritDoc} - */ public boolean setPosition(int position) { throw new UnsupportedOperationException(); } @@ -196,10 +172,7 @@ return availableRegister - 1; } - /** - * {@inheritDoc} - */ public String toString() { return super.toString() + ":" + pointer.asPath(); } -} \ No newline at end of file +}