commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ebo...@apache.org
Subject svn commit: r652845 [3/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 GMT
Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyIterator.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyIterator.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyIterator.java Fri May  2 10:46:46 2008
@@ -21,7 +21,7 @@
 import org.apache.commons.jxpath.ri.model.NodePointer;
 
 /**
- * Iterates property values of an object pointed at with a PropertyOwnerPointer.
+ * Iterates property values of an object pointed at with a {@link PropertyOwnerPointer}.
  * Examples of such objects are JavaBeans and objects with Dynamic Properties.
  *
  * @author Dmitri Plotnikov
@@ -99,9 +99,6 @@
         targetReady = false;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer getNodePointer() {
         if (position == 0) {
             if (name != null) {
@@ -134,16 +131,10 @@
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int getPosition() {
         return position;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean setPosition(int position) {
         return name == null ? setPositionAllProperties(position) : setPositionIndividualProperty(position);
     }
@@ -332,4 +323,4 @@
         }
         return length;
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyOwnerPointer.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyOwnerPointer.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyOwnerPointer.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyOwnerPointer.java Fri May  2 10:46:46 2008
@@ -40,9 +40,6 @@
 
     private Object value = UNINITIALIZED;
 
-    /**
-     * {@inheritDoc}
-     */
     public NodeIterator childIterator(NodeTest test, boolean reverse,
             NodePointer startWith) {
         if (test == null) {
@@ -73,9 +70,6 @@
         return new PropertyIterator(this, property, reverse, startWith);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodeIterator attributeIterator(QName name) {
         return new BeanAttributeIterator(this, name);
     }
@@ -97,9 +91,6 @@
         super(parent);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public void setIndex(int index) {
         if (this.index != index) {
             super.setIndex(index);
@@ -107,9 +98,6 @@
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getImmediateNode() {
         if (value == UNINITIALIZED) {
             value = index == WHOLE_COLLECTION ? ValueUtils.getValue(getBaseValue())
@@ -118,9 +106,6 @@
         return value;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public abstract QName getName();
 
     /**
@@ -192,12 +177,9 @@
         return false;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int compareChildNodePointers(NodePointer pointer1,
             NodePointer pointer2) {
         int r = pointer1.getName().toString().compareTo(pointer2.getName().toString());
         return r == 0 ? pointer1.getIndex() - pointer2.getIndex() : r;
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyPointer.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyPointer.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyPointer.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyPointer.java Fri May  2 10:46:46 2008
@@ -79,9 +79,6 @@
         return bean;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public QName getName() {
         return new QName(null, getPropertyName());
     }
@@ -116,9 +113,6 @@
      */
     protected abstract boolean isActualProperty();
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isActual() {
         if (!isActualProperty()) {
             return false;
@@ -131,9 +125,6 @@
 
     private Object value = UNINITIALIZED;
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getImmediateNode() {
         if (value == UNINITIALIZED) {
             value = index == WHOLE_COLLECTION ? ValueUtils.getValue(getBaseValue())
@@ -142,17 +133,11 @@
         return value;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isCollection() {
         Object value = getBaseValue();
         return value != null && ValueUtils.isCollection(value);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isLeaf() {
         Object value = getNode();
         return value == null || JXPathIntrospector.getBeanInfo(value.getClass()).isAtomic();
@@ -179,9 +164,6 @@
             getImmediateNode());
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer createPath(JXPathContext context) {
         if (getImmediateNode() == null) {
             AbstractFactory factory = getAbstractFactory(context);
@@ -201,9 +183,6 @@
         return this;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer createPath(JXPathContext context, Object value) {
         // If neccessary, expand collection
         if (index != WHOLE_COLLECTION && index >= getLength()) {
@@ -213,9 +192,6 @@
         return this;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer createChild(
         JXPathContext context,
         QName name,
@@ -229,9 +205,6 @@
         return prop.createPath(context, value);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer createChild(
         JXPathContext context,
         QName name,
@@ -244,16 +217,10 @@
         return prop.createPath(context);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int hashCode() {
         return getImmediateParentPointer().hashCode() + propertyIndex + index;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean equals(Object object) {
         if (object == this) {
             return true;
@@ -278,13 +245,10 @@
         return iThis == iOther;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int compareChildNodePointers(
         NodePointer pointer1,
         NodePointer pointer2) {
         return getValuePointer().compareChildNodePointers(pointer1, pointer2);
     }
 
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/container/ContainerPointer.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/container/ContainerPointer.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/container/ContainerPointer.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/container/ContainerPointer.java Fri May  2 10:46:46 2008
@@ -26,7 +26,7 @@
 import org.apache.commons.jxpath.util.ValueUtils;
 
 /**
- * Transparent pointer to a Container. The getValue() method
+ * Transparent pointer to a Container. The {@link #getValue()} method
  * returns the contents of the container, rather than the container
  * itself.
  *
@@ -65,46 +65,28 @@
         return true;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public QName getName() {
         return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getBaseValue() {
         return container;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isCollection() {
         Object value = getBaseValue();
         return value != null && ValueUtils.isCollection(value);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int getLength() {
         Object value = getBaseValue();
         return value == null ? 1 : ValueUtils.getLength(value);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isLeaf() {
         return getValuePointer().isLeaf();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getImmediateNode() {
         Object value = getBaseValue();
         if (index != WHOLE_COLLECTION) {
@@ -113,17 +95,11 @@
         return ValueUtils.getValue(value);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public void setValue(Object value) {
         // TODO: what if this is a collection?
         container.setValue(value);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer getImmediateValuePointer() {
         if (valuePointer == null) {
             Object value = getImmediateNode();
@@ -132,16 +108,10 @@
         return valuePointer;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int hashCode() {
         return System.identityHashCode(container) + index;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean equals(Object object) {
         if (object == this) {
             return true;
@@ -155,9 +125,6 @@
         return container == other.container && index == other.index;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodeIterator childIterator(
         NodeTest test,
         boolean reverse,
@@ -165,54 +132,33 @@
         return getValuePointer().childIterator(test, reverse, startWith);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodeIterator attributeIterator(QName name) {
         return getValuePointer().attributeIterator(name);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodeIterator namespaceIterator() {
         return getValuePointer().namespaceIterator();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer namespacePointer(String namespace) {
         return getValuePointer().namespacePointer(namespace);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean testNode(NodeTest nodeTest) {
         return getValuePointer().testNode(nodeTest);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int compareChildNodePointers(
         NodePointer pointer1,
         NodePointer pointer2) {
         return pointer1.getIndex() - pointer2.getIndex();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public String getNamespaceURI(String prefix) {
         return getValuePointer().getNamespaceURI(prefix);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public String asPath() {
         return parent == null ? "/" : parent.asPath();
     }
- }
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/container/ContainerPointerFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/container/ContainerPointerFactory.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/container/ContainerPointerFactory.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/container/ContainerPointerFactory.java Fri May  2 10:46:46 2008
@@ -24,7 +24,7 @@
 import org.apache.commons.jxpath.ri.model.NodePointerFactory;
 
 /**
- * Implements NodePointerFactory for Container objects.
+ * Implements NodePointerFactory for {@link Container} objects.
  *
  * @author Dmitri Plotnikov
  * @version $Revision$ $Date$
@@ -33,27 +33,18 @@
     /** factory order for this factory */
     public static final int CONTAINER_POINTER_FACTORY_ORDER = 200;
 
-    /**
-     * {@inheritDoc}
-     */
     public int getOrder() {
         return CONTAINER_POINTER_FACTORY_ORDER;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer createNodePointer(QName name, Object bean, Locale locale) {
         return bean instanceof Container ? new ContainerPointer(
                 (Container) bean, locale) : null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer createNodePointer(NodePointer parent, QName name,
             Object bean) {
         return bean instanceof Container ? new ContainerPointer(parent,
                 (Container) bean) : null;
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributeIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributeIterator.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributeIterator.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributeIterator.java Fri May  2 10:46:46 2008
@@ -148,9 +148,6 @@
         return element.getAttributeNode(name.getName());
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer getNodePointer() {
         if (position == 0) {
             if (!setPosition(1)) {
@@ -165,18 +162,12 @@
         return new DOMAttributePointer(parent, (Attr) attributes.get(index));
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int getPosition() {
         return position;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean setPosition(int position) {
         this.position = position;
         return position >= 1 && position <= attributes.size();
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributePointer.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributePointer.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributePointer.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributePointer.java Fri May  2 10:46:46 2008
@@ -43,26 +43,17 @@
         this.attr = attr;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public QName getName() {
         return new QName(
             DOMNodePointer.getPrefix(attr),
             DOMNodePointer.getLocalName(attr));
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public String getNamespaceURI() {
         String prefix = DOMNodePointer.getPrefix(attr);
         return prefix == null ? null : parent.getNamespaceURI(prefix);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getValue() {
         String value = attr.getValue();
         if (value == null || (value.equals("") && !attr.getSpecified())) {
@@ -71,51 +62,30 @@
         return value;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getBaseValue() {
         return attr;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isCollection() {
         return false;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int getLength() {
         return 1;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getImmediateNode() {
         return attr;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isActual() {
         return true;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isLeaf() {
         return true;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean testNode(NodeTest nodeTest) {
         return nodeTest == null
             || ((nodeTest instanceof NodeTypeTest)
@@ -130,16 +100,10 @@
         attr.setValue((String) TypeUtils.convert(value, String.class));
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public void remove() {
         attr.getOwnerElement().removeAttributeNode(attr);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public String asPath() {
         StringBuffer buffer = new StringBuffer();
         if (parent != null) {
@@ -154,27 +118,18 @@
         return buffer.toString();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int hashCode() {
         return System.identityHashCode(attr);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean equals(Object object) {
         return object == this || object instanceof DOMAttributePointer
                 && attr == ((DOMAttributePointer) object).attr;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int compareChildNodePointers(NodePointer pointer1,
             NodePointer pointer2) {
         // Won't happen - attributes don't have children
         return 0;
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNamespaceIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNamespaceIterator.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNamespaceIterator.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNamespaceIterator.java Fri May  2 10:46:46 2008
@@ -75,9 +75,6 @@
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer getNodePointer() {
         if (position == 0) {
             if (!setPosition(1)) {
@@ -98,18 +95,12 @@
         return new NamespacePointer(parent, prefix, attr.getValue());
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int getPosition() {
         return position;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean setPosition(int position) {
         this.position = position;
         return position >= 1 && position <= attributes.size();
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodeIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodeIterator.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodeIterator.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodeIterator.java Fri May  2 10:46:46 2008
@@ -56,9 +56,6 @@
         this.reverse = reverse;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer getNodePointer() {
         if (position == 0) {
             setPosition(1);
@@ -66,16 +63,10 @@
         return child == null ? null : new DOMNodePointer(parent, child);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int getPosition() {
         return position;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean setPosition(int position) {
         while (this.position < position) {
             if (!next()) {
@@ -167,4 +158,4 @@
     private boolean testChild() {
         return DOMNodePointer.testNode(child, nodeTest);
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java Fri May  2 10:46:46 2008
@@ -100,9 +100,6 @@
         this.node = node;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean testNode(NodeTest test) {
         return testNode(node, test);
     }
@@ -155,12 +152,11 @@
                     return false;
             }
         }
-        if (test instanceof ProcessingInstructionTest) {
-            if (node.getNodeType() == Node.PROCESSING_INSTRUCTION_NODE) {
-                String testPI = ((ProcessingInstructionTest) test).getTarget();
-                String nodePI = ((ProcessingInstruction) node).getTarget();
-                return testPI.equals(nodePI);
-            }
+        if (test instanceof ProcessingInstructionTest
+                && node.getNodeType() == Node.PROCESSING_INSTRUCTION_NODE) {
+            String testPI = ((ProcessingInstructionTest) test).getTarget();
+            String nodePI = ((ProcessingInstruction) node).getTarget();
+            return testPI.equals(nodePI);
         }
         return false;
     }
@@ -180,9 +176,6 @@
         return s1.equals(s2);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public QName getName() {
         String ln = null;
         String ns = null;
@@ -197,45 +190,27 @@
         return new QName(ns, ln);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public String getNamespaceURI() {
         return getNamespaceURI(node);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodeIterator childIterator(NodeTest test, boolean reverse,
             NodePointer startWith) {
         return new DOMNodeIterator(this, test, reverse, startWith);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodeIterator attributeIterator(QName name) {
         return new DOMAttributeIterator(this, name);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer namespacePointer(String prefix) {
         return new NamespacePointer(this, prefix);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodeIterator namespaceIterator() {
         return new DOMNamespaceIterator(this);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public synchronized NamespaceResolver getNamespaceResolver() {
         if (localNamespaceResolver == null) {
             localNamespaceResolver = new NamespaceResolver(super.getNamespaceResolver());
@@ -244,9 +219,6 @@
         return localNamespaceResolver;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public String getNamespaceURI(String prefix) {
         if (prefix == null || prefix.equals("")) {
             return getDefaultNamespaceURI();
@@ -298,9 +270,6 @@
         return namespace;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public String getDefaultNamespaceURI() {
         if (defaultNamespace == null) {
             Node aNode = node;
@@ -325,44 +294,26 @@
         return defaultNamespace.equals("") ? null : defaultNamespace;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getBaseValue() {
         return node;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getImmediateNode() {
         return node;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isActual() {
         return true;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isCollection() {
         return false;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int getLength() {
         return 1;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isLeaf() {
         return !node.hasChildNodes();
     }
@@ -460,9 +411,6 @@
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer createChild(JXPathContext context, QName name, int index) {
         if (index == WHOLE_COLLECTION) {
             index = 0;
@@ -491,9 +439,6 @@
                         + "/" + name + "[" + (index + 1) + "]");
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer createChild(JXPathContext context, QName name,
             int index, Object value) {
         NodePointer ptr = createChild(context, name, index);
@@ -501,9 +446,6 @@
         return ptr;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer createAttribute(JXPathContext context, QName name) {
         if (!(node instanceof Element)) {
             return super.createAttribute(context, name);
@@ -532,9 +474,6 @@
         return it.getNodePointer();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public void remove() {
         Node parent = node.getParentNode();
         if (parent == null) {
@@ -543,9 +482,6 @@
         parent.removeChild(node);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public String asPath() {
         if (id != null) {
             return "id('" + escape(id) + "')";
@@ -682,16 +618,10 @@
         return count;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int hashCode() {
         return node.hashCode();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean equals(Object object) {
         return object == this || object instanceof DOMNodePointer && node == ((DOMNodePointer) object).node;
     }
@@ -761,9 +691,6 @@
         return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getValue() {
         if (node.getNodeType() == Node.COMMENT_NODE) {
             String text = ((Comment) node).getData();
@@ -814,9 +741,6 @@
                 : new DOMNodePointer(element, getLocale(), id);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int compareChildNodePointers(NodePointer pointer1,
             NodePointer pointer2) {
         Node node1 = (Node) pointer1.getBaseValue();

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMPointerFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMPointerFactory.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMPointerFactory.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMPointerFactory.java Fri May  2 10:46:46 2008
@@ -34,16 +34,10 @@
     /** factory order */
     public static final int DOM_POINTER_FACTORY_ORDER = 100;
 
-    /**
-     * {@inheritDoc}
-     */
     public int getOrder() {
         return DOM_POINTER_FACTORY_ORDER;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer createNodePointer(
         QName name,
         Object bean,
@@ -51,13 +45,10 @@
         return bean instanceof Node ? new DOMNodePointer((Node) bean, locale) : null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer createNodePointer(
         NodePointer parent,
         QName name,
         Object bean) {
         return bean instanceof Node ? new DOMNodePointer(parent, (Node) bean) : null;
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/NamespacePointer.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/NamespacePointer.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/NamespacePointer.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/NamespacePointer.java Fri May  2 10:46:46 2008
@@ -57,44 +57,26 @@
         this.namespaceURI = namespaceURI;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public QName getName() {
         return new QName(prefix);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getBaseValue() {
         return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isCollection() {
         return false;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int getLength() {
         return 1;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getImmediateNode() {
         return getNamespaceURI();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public String getNamespaceURI() {
         if (namespaceURI == null) {
             namespaceURI = parent.getNamespaceURI(prefix);
@@ -102,9 +84,6 @@
         return namespaceURI;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isLeaf() {
         return true;
     }
@@ -117,9 +96,6 @@
         throw new UnsupportedOperationException("Cannot modify DOM trees");
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean testNode(NodeTest nodeTest) {
         return nodeTest == null
             || ((nodeTest instanceof NodeTypeTest)
@@ -127,9 +103,6 @@
                     == Compiler.NODE_TYPE_NODE);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public String asPath() {
         StringBuffer buffer = new StringBuffer();
         if (parent != null) {
@@ -144,16 +117,10 @@
         return buffer.toString();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int hashCode() {
         return prefix.hashCode();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean equals(Object object) {
         if (object == this) {
             return true;
@@ -167,13 +134,10 @@
         return prefix.equals(other.prefix);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int compareChildNodePointers(
         NodePointer pointer1,
         NodePointer pointer2) {
         // Won't happen - namespaces don't have children
         return 0;
     }
- }
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPointer.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPointer.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPointer.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPointer.java Fri May  2 10:46:46 2008
@@ -26,7 +26,7 @@
 
 
 /**
- * A Pointer that points to a DynaBean.
+ * A Pointer that points to a {@link DynaBean}.
  *
  * @author Dmitri Plotnikov
  * @version $Revision$ $Date$
@@ -59,65 +59,38 @@
         this.dynaBean = dynaBean;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public PropertyPointer getPropertyPointer() {
         return new DynaBeanPropertyPointer(this, dynaBean);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public QName getName() {
         return name;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getBaseValue() {
         return dynaBean;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getImmediateNode() {
         return dynaBean;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isCollection() {
         return false;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int getLength() {
         return 1;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isLeaf() {
         return false;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int hashCode() {
         return name == null ? 0 : name.hashCode();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean equals(Object object) {
         if (object == this) {
             return true;
@@ -137,9 +110,6 @@
         return iThis == iOther && dynaBean == other.dynaBean;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public String asPath() {
         return parent == null ? "/" : super.asPath();
     }
@@ -153,4 +123,4 @@
     private static boolean equalObjects(Object o1, Object o2) {
         return o1 == o2 || o1 != null && o1.equals(o2);
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPointerFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPointerFactory.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPointerFactory.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPointerFactory.java Fri May  2 10:46:46 2008
@@ -37,25 +37,16 @@
     /** factory order constant */
     public static final int DYNA_BEAN_POINTER_FACTORY_ORDER = 700;
 
-    /**
-     * {@inheritDoc}
-     */
     public int getOrder() {
         return DYNA_BEAN_POINTER_FACTORY_ORDER;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer createNodePointer(QName name, Object bean, Locale locale) {
         return bean instanceof DynaBean ? new DynaBeanPointer(name, (DynaBean) bean, locale) : null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer createNodePointer(NodePointer parent, QName name,
             Object bean) {
         return bean instanceof DynaBean ? new DynaBeanPointer(parent, name, (DynaBean) bean) : null;
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPropertyPointer.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPropertyPointer.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPropertyPointer.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPropertyPointer.java Fri May  2 10:46:46 2008
@@ -28,7 +28,7 @@
 import org.apache.commons.jxpath.util.ValueUtils;
 
 /**
- * Pointer pointing to a property of a DynaBean.
+ * Pointer pointing to a property of a {@link DynaBean}.
  *
  * @author Dmitri Plotnikov
  * @version $Revision$ $Date$
@@ -48,9 +48,6 @@
         this.dynaBean = dynaBean;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getBaseValue() {
         return dynaBean.get(getPropertyName());
     }
@@ -63,16 +60,10 @@
         return true;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int getPropertyCount() {
         return getPropertyNames().length;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public String[] getPropertyNames() {
         /* @todo do something about the sorting - LIKE WHAT? - MJB */
         if (names == null) {
@@ -222,9 +213,6 @@
         setValue(index, value);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public void remove() {
         if (index == WHOLE_COLLECTION) {
             dynaBean.set(getPropertyName(), null);
@@ -289,4 +277,4 @@
                             + type, ex);
         }
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicAttributeIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicAttributeIterator.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicAttributeIterator.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicAttributeIterator.java Fri May  2 10:46:46 2008
@@ -39,9 +39,6 @@
         super(parent, name);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     protected void prepareForIndividualProperty(String name) {
          ((DynamicPropertyPointer) getPropertyPointer()).setPropertyName(name);
          super.prepareForIndividualProperty(name);

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPointer.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPointer.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPointer.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPointer.java Fri May  2 10:46:46 2008
@@ -30,7 +30,7 @@
 /**
  * A Pointer that points to an object with Dynamic Properties. It is used for
  * the first element of a path; following elements will by of type
- * PropertyPointer.
+ * {@link PropertyPointer}.
  *
  * @author Dmitri Plotnikov
  * @version $Revision$ $Date$
@@ -70,38 +70,23 @@
         this.handler = handler;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public PropertyPointer getPropertyPointer() {
         return new DynamicPropertyPointer(this, handler);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodeIterator createNodeIterator(
                 String property, boolean reverse, NodePointer startWith) {
         return new PropertyIterator(this, property, reverse, startWith);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodeIterator attributeIterator(QName name) {
         return new DynamicAttributeIterator(this, name);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public QName getName() {
         return name;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isDynamicPropertyDeclarationSupported() {
         return true;
     }
@@ -114,17 +99,11 @@
         return bean;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isLeaf() {
         Object value = getNode();
         return value == null || JXPathIntrospector.getBeanInfo(value.getClass()).isAtomic();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isCollection() {
         return false;
     }
@@ -137,23 +116,14 @@
         return 1;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public String asPath() {
         return parent == null ? "/" : super.asPath();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int hashCode() {
         return System.identityHashCode(bean) + name.hashCode();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean equals(Object object) {
         if (object == this) {
             return true;
@@ -166,4 +136,4 @@
         DynamicPointer other = (DynamicPointer) object;
         return bean == other.bean && name.equals(other.name);
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPointerFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPointerFactory.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPointerFactory.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPointerFactory.java Fri May  2 10:46:46 2008
@@ -40,16 +40,10 @@
      */
     public static final int DYNAMIC_POINTER_FACTORY_ORDER = 800;
 
-    /**
-     * {@inheritDoc}
-     */
     public int getOrder() {
         return DYNAMIC_POINTER_FACTORY_ORDER;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer createNodePointer(
         QName name,
         Object bean,
@@ -64,9 +58,6 @@
         return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer createNodePointer(
         NodePointer parent,
         QName name,
@@ -84,4 +75,4 @@
         }
         return null;
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPropertyPointer.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPropertyPointer.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPropertyPointer.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPropertyPointer.java Fri May  2 10:46:46 2008
@@ -214,9 +214,6 @@
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer createPath(JXPathContext context) {
         // Ignore the name passed to us, use our own data
         Object collection = getBaseValue();
@@ -251,9 +248,6 @@
         return this;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer createPath(JXPathContext context, Object value) {
         if (index == WHOLE_COLLECTION) {
             handler.setProperty(getBean(), getPropertyName(), value);
@@ -265,9 +259,6 @@
         return this;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public void remove() {
         if (index == WHOLE_COLLECTION) {
             removeKey();
@@ -294,9 +285,6 @@
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public String asPath() {
         StringBuffer buffer = new StringBuffer();
         buffer.append(getImmediateParentPointer().asPath());
@@ -315,4 +303,4 @@
         return buffer.toString();
     }
 
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributeIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributeIterator.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributeIterator.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributeIterator.java Fri May  2 10:46:46 2008
@@ -91,9 +91,6 @@
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer getNodePointer() {
         if (position == 0) {
             if (!setPosition(1)) {
@@ -110,16 +107,10 @@
             (Attribute) attributes.get(index));
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int getPosition() {
         return position;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean setPosition(int position) {
         if (attributes == null) {
             return false;
@@ -127,4 +118,4 @@
         this.position = position;
         return position >= 1 && position <= attributes.size();
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributePointer.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributePointer.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributePointer.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributePointer.java Fri May  2 10:46:46 2008
@@ -40,18 +40,12 @@
         this.attr = attr;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public QName getName() {
         return new QName(
             JDOMNodePointer.getPrefix(attr),
             JDOMNodePointer.getLocalName(attr));
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public String getNamespaceURI() {
         String uri = attr.getNamespaceURI();
         if (uri != null && uri.equals("")) {
@@ -60,72 +54,42 @@
         return uri;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getValue() {
         return attr.getValue();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getBaseValue() {
         return attr;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isCollection() {
         return false;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int getLength() {
         return 1;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getImmediateNode() {
         return attr;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isActual() {
         return true;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isLeaf() {
         return true;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public void setValue(Object value) {
         attr.setValue((String) TypeUtils.convert(value, String.class));
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public void remove() {
         attr.getParent().removeAttribute(attr);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public String asPath() {
         StringBuffer buffer = new StringBuffer();
         if (parent != null) {
@@ -140,28 +104,19 @@
         return buffer.toString();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int hashCode() {
         return System.identityHashCode(attr);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean equals(Object object) {
         return object == this || object instanceof JDOMAttributePointer
                 && ((JDOMAttributePointer) object).attr == attr;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int compareChildNodePointers(
             NodePointer pointer1,
             NodePointer pointer2) {
         // Won't happen - attributes don't have children
         return 0;
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNamespaceIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNamespaceIterator.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNamespaceIterator.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNamespaceIterator.java Fri May  2 10:46:46 2008
@@ -80,9 +80,6 @@
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer getNodePointer() {
         if (position == 0) {
             if (!setPosition(1)) {
@@ -98,16 +95,10 @@
         return new JDOMNamespacePointer(parent, ns.getPrefix(), ns.getURI());
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int getPosition() {
         return position;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean setPosition(int position) {
         if (namespaces == null) {
             return false;
@@ -115,4 +106,4 @@
         this.position = position;
         return position >= 1 && position <= namespaces.size();
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNamespacePointer.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNamespacePointer.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNamespacePointer.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNamespacePointer.java Fri May  2 10:46:46 2008
@@ -54,44 +54,26 @@
         this.namespaceURI = namespaceURI;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public QName getName() {
         return new QName(prefix);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getBaseValue() {
         return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isCollection() {
         return false;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int getLength() {
         return 1;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getImmediateNode() {
         return getNamespaceURI();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public String getNamespaceURI() {
         if (namespaceURI == null) {
             namespaceURI = parent.getNamespaceURI(prefix);
@@ -99,9 +81,6 @@
         return namespaceURI;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isLeaf() {
         return true;
     }
@@ -114,9 +93,6 @@
         throw new UnsupportedOperationException("Cannot modify a namespace");
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public String asPath() {
         StringBuffer buffer = new StringBuffer();
         if (parent != null) {
@@ -131,27 +107,18 @@
         return buffer.toString();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int hashCode() {
         return prefix.hashCode();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean equals(Object object) {
         return object == this || object instanceof JDOMNamespacePointer && prefix.equals(((JDOMNamespacePointer) object).prefix);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int compareChildNodePointers(
         NodePointer pointer1,
         NodePointer pointer2) {
         // Won't happen - namespaces don't have children
         return 0;
     }
- }
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodeIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodeIterator.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodeIterator.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodeIterator.java Fri May  2 10:46:46 2008
@@ -70,9 +70,6 @@
         this.reverse = reverse;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer getNodePointer() {
         if (child == null) {
             if (!setPosition(1)) {
@@ -84,16 +81,10 @@
         return new JDOMNodePointer(parent, child);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int getPosition() {
         return position;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean setPosition(int position) {
         while (this.position < position) {
             if (!next()) {
@@ -187,4 +178,4 @@
     private boolean testChild() {
         return JDOMNodePointer.testNode(parent, child, nodeTest);
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java Fri May  2 10:46:46 2008
@@ -94,9 +94,6 @@
         this.node = node;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodeIterator childIterator(
         NodeTest test,
         boolean reverse,
@@ -104,30 +101,18 @@
         return new JDOMNodeIterator(this, test, reverse, startWith);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodeIterator attributeIterator(QName name) {
         return new JDOMAttributeIterator(this, name);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodeIterator namespaceIterator() {
         return new JDOMNamespaceIterator(this);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer namespacePointer(String prefix) {
         return new JDOMNamespacePointer(this, prefix);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public String getNamespaceURI() {
         return getNamespaceURI(node);
     }
@@ -149,9 +134,6 @@
         return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public synchronized NamespaceResolver getNamespaceResolver() {
         if (localNamespaceResolver == null) {
             localNamespaceResolver = new NamespaceResolver(super.getNamespaceResolver());
@@ -160,9 +142,6 @@
         return localNamespaceResolver;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public String getNamespaceURI(String prefix) {
         if (prefix.equals("xml")) {
             return Namespace.XML_NAMESPACE.getURI();
@@ -181,9 +160,6 @@
         return ns == null ? null : ns.getURI();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int compareChildNodePointers(
         NodePointer pointer1,
         NodePointer pointer2) {
@@ -238,30 +214,18 @@
         return 0;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getBaseValue() {
         return node;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isCollection() {
         return false;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int getLength() {
         return 1;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isLeaf() {
         if (node instanceof Element) {
             return ((Element) node).getContent().size() == 0;
@@ -272,9 +236,6 @@
         return true;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public QName getName() {
         String ns = null;
         String ln = null;
@@ -291,16 +252,10 @@
         return new QName(ns, ln);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getImmediateNode() {
         return node;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getValue() {
         if (node instanceof Element) {
             StringBuffer buf = new StringBuffer();
@@ -330,9 +285,6 @@
         return result != null && trim ? result.trim() : result;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public void setValue(Object value) {
         if (node instanceof Text) {
             String string = (String) TypeUtils.convert(value, String.class);
@@ -411,9 +363,6 @@
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean testNode(NodeTest test) {
         return testNode(this, node, test);
     }
@@ -590,9 +539,6 @@
         return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer createChild(
         JXPathContext context,
         QName name,
@@ -625,9 +571,6 @@
                 + (index + 1) + "]");
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer createChild(
             JXPathContext context, QName name, int index, Object value) {
         NodePointer ptr = createChild(context, name, index);
@@ -635,9 +578,6 @@
         return ptr;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer createAttribute(JXPathContext context, QName name) {
         if (!(node instanceof Element)) {
             return super.createAttribute(context, name);
@@ -668,9 +608,6 @@
         return it.getNodePointer();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public void remove() {
         Element parent = nodeParent(node);
         if (parent == null) {
@@ -679,9 +616,6 @@
         parent.getContent().remove(node);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public String asPath() {
         if (id != null) {
             return "id('" + escape(id) + "')";
@@ -856,16 +790,10 @@
         return count;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int hashCode() {
         return node.hashCode();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean equals(Object object) {
         if (object == this) {
             return true;
@@ -879,4 +807,4 @@
         return node == other.node;
     }
 
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMPointerFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMPointerFactory.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMPointerFactory.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMPointerFactory.java Fri May  2 10:46:46 2008
@@ -35,16 +35,10 @@
     /** factory order constant */
     public static final int JDOM_POINTER_FACTORY_ORDER = 110;
 
-    /**
-     * {@inheritDoc}
-     */
     public int getOrder() {
         return JDOM_POINTER_FACTORY_ORDER;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer createNodePointer(
             QName name, Object bean, Locale locale) {
         if (bean instanceof Document) {
@@ -56,9 +50,6 @@
         return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public NodePointer createNodePointer(
             NodePointer parent, QName name, Object bean) {
         if (bean instanceof Document) {
@@ -69,4 +60,4 @@
         }
         return null;
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/Constants.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/Constants.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/Constants.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/Constants.java Fri May  2 10:46:46 2008
@@ -25,28 +25,28 @@
 public final class Constants {
 
     /**
-     * Variable name for ServletContext.
+     * Variable name for {@link javax.servlet.ServletContext}.
      */
     public static final String APPLICATION_SCOPE = "application";
 
     /**
-     * Variable name for HttpSession.
+     * Variable name for {@link javax.servlet.http.HttpSession}.
      */
     public static final String SESSION_SCOPE = "session";
 
     /**
-     * Variable name for ServletRequest.
+     * Variable name for {@link javax.servlet.ServletRequest}.
      */
     public static final String REQUEST_SCOPE = "request";
 
     /**
-     * Variable name for PageContext.
+     * Variable name for {@link javax.servlet.jsp.PageContext}.
      */
     public static final String PAGE_SCOPE = "page";
 
     /**
      * Attribute  name used in page context, requst, session, and servlet
-     * context to store the corresponding JXPathContext.
+     * context to store the corresponding {@link org.apache.commons.jxpath.JXPathContext}.
      */
     public static final String JXPATH_CONTEXT =
         "org.apache.commons.jxpath.JXPATH_CONTEXT";

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/HttpSessionHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/HttpSessionHandler.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/HttpSessionHandler.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/HttpSessionHandler.java Fri May  2 10:46:46 2008
@@ -18,23 +18,19 @@
 
 import java.util.Enumeration;
 import java.util.HashSet;
-
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.jxpath.JXPathException;
 
 /**
- * Implementation of the DynamicPropertyHandler interface that provides
- * access to attributes of a HttpSession.
+ * Implementation of the {@link org.apache.commons.jxpath.DynamicPropertyHandler}
+ * interface that provides access to attributes of a @{link HttpSession}.
  *
  * @author Dmitri Plotnikov
  * @version $Revision$ $Date$
  */
 public class HttpSessionHandler extends ServletContextHandler {
 
-    /**
-     * {@inheritDoc}
-     */
     protected void collectPropertyNames(HashSet set, Object bean) {
         HttpSessionAndServletContext handle =
             (HttpSessionAndServletContext) bean;
@@ -48,9 +44,6 @@
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getProperty(Object bean, String property) {
         HttpSessionAndServletContext handle =
             (HttpSessionAndServletContext) bean;
@@ -64,9 +57,6 @@
         return super.getProperty(handle.getServletContext(), property);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public void setProperty(Object bean, String property, Object value) {
         HttpSessionAndServletContext handle =
             (HttpSessionAndServletContext) bean;

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/JXPathServletContexts.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/JXPathServletContexts.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/JXPathServletContexts.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/JXPathServletContexts.java Fri May  2 10:46:46 2008
@@ -26,10 +26,11 @@
 import org.apache.commons.jxpath.JXPathIntrospector;
 
 /**
- * Static methods that allocate and cache JXPathContexts bound to PageContext,
- * ServletRequest, HttpSession and ServletContext.
+ * Static methods that allocate and cache JXPathContexts bound to
+ * {@link PageContext}, {@link ServletRequest}, {@link HttpSession}
+ * and {@link ServletContext}.
  * <p>
- * The JXPathContext returned by {@link #getPageContext getPageContext()}
+ * The {@link JXPathContext} returned by {@link #getPageContext getPageContext()}
  * provides access to all scopes via the PageContext.findAttribute()
  * method.  Thus, an expression like "foo" will first look for the attribute
  * named "foo" in the "page" context, then the "request" context, then

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/KeywordVariables.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/KeywordVariables.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/KeywordVariables.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/KeywordVariables.java Fri May  2 10:46:46 2008
@@ -43,31 +43,19 @@
         this.object = object;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isDeclaredVariable(String variable) {
         return variable.equals(keyword);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getVariable(String variable) {
         return isDeclaredVariable(variable) ? object : null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public void declareVariable(String variable, Object value) {
         throw new UnsupportedOperationException(
             "Cannot declare new keyword variables.");
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public void undeclareVariable(String variable) {
         throw new UnsupportedOperationException(
             "Cannot undeclare keyword variables.");

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/PageContextHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/PageContextHandler.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/PageContextHandler.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/PageContextHandler.java Fri May  2 10:46:46 2008
@@ -24,17 +24,14 @@
 import org.apache.commons.jxpath.DynamicPropertyHandler;
 
 /**
- * Implementation of the DynamicPropertyHandler interface that provides
- * access to attributes of a PageContext in all scopes.
+ * Implementation of the {@link DynamicPropertyHandler} interface that provides
+ * access to attributes of a {@link PageContext} in all scopes.
  *
  * @author Dmitri Plotnikov
  * @version $Revision$ $Date$
  */
 public class PageContextHandler implements DynamicPropertyHandler {
 
-    /**
-     * {@inheritDoc}
-     */
     public String[] getPropertyNames(Object pageContext) {
         HashSet list = new HashSet();
         Enumeration e =
@@ -74,9 +71,6 @@
         return ((PageContext) pageContext).findAttribute(property);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public void setProperty(Object pageContext, String property, Object value) {
         ((PageContext) pageContext).setAttribute(
             property,

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/PageScopeContext.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/PageScopeContext.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/PageScopeContext.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/PageScopeContext.java Fri May  2 10:46:46 2008
@@ -21,7 +21,7 @@
 import javax.servlet.jsp.PageContext;
 
 /**
- * A lightweight wrapper for PageContext that restricts access
+ * A lightweight wrapper for {@link PageContext} that restricts access
  * to attributes of the "page" scope.  This object is needed so that
  * XPath "foo" would lookup the attribute "foo" in all scopes, while
  * "$page/foo" would only look in the "page" scope.

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/PageScopeContextHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/PageScopeContextHandler.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/PageScopeContextHandler.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/PageScopeContextHandler.java Fri May  2 10:46:46 2008
@@ -22,8 +22,8 @@
 import org.apache.commons.jxpath.DynamicPropertyHandler;
 
 /**
- * Implementation of the DynamicPropertyHandler interface that provides
- * access to attributes of a PageScopeContext.
+ * Implementation of the {@link DynamicPropertyHandler} interface that provides
+ * access to attributes of a {@link PageScopeContext}.
  *
  * @author Dmitri Plotnikov
  * @version $Revision$ $Date$
@@ -32,9 +32,6 @@
 
     private static final int DEFAULT_LIST_SIZE = 16;
 
-    /**
-     * {@inheritDoc}
-     */
     public String[] getPropertyNames(Object pageScope) {
         Enumeration e = ((PageScopeContext) pageScope).getAttributeNames();
         ArrayList list = new ArrayList(DEFAULT_LIST_SIZE);
@@ -44,16 +41,10 @@
         return (String[]) list.toArray(new String[list.size()]);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getProperty(Object pageScope, String property) {
         return ((PageScopeContext) pageScope).getAttribute(property);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public void setProperty(Object pageScope, String property, Object value) {
         ((PageScopeContext) pageScope).setAttribute(property, value);
     }

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletContextHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletContextHandler.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletContextHandler.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletContextHandler.java Fri May  2 10:46:46 2008
@@ -24,8 +24,8 @@
 import org.apache.commons.jxpath.DynamicPropertyHandler;
 
 /**
- * Implementation of the DynamicPropertyHandler interface that provides
- * access to attributes of a ServletContext.
+ * Implementation of the {@link DynamicPropertyHandler} interface that provides
+ * access to attributes of a {@link ServletContext}.
  *
  * @author Dmitri Plotnikov
  * @version $Revision$ $Date$
@@ -34,9 +34,6 @@
 
     private static final int DEFAULT_PROPERTY_COUNT = 16;
 
-    /**
-     * {@inheritDoc}
-     */
     public String[] getPropertyNames(Object context) {
         HashSet list = new HashSet(DEFAULT_PROPERTY_COUNT);
         collectPropertyNames(list, context);
@@ -55,16 +52,10 @@
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getProperty(Object context, String property) {
         return ((ServletContext) context).getAttribute(property);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public void setProperty(Object context, String property, Object value) {
         ((ServletContext) context).setAttribute(property, value);
     }

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletRequestAndContext.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletRequestAndContext.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletRequestAndContext.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletRequestAndContext.java Fri May  2 10:46:46 2008
@@ -22,7 +22,8 @@
 import javax.servlet.http.HttpSession;
 
 /**
- * Just a structure to hold a ServletRequest and ServletContext together.
+ * Just a structure to hold a {@link ServletRequest} and {@link ServletContext}
+ * together.
  *
  * @author Dmitri Plotnikov
  * @version $Revision$ $Date$
@@ -32,6 +33,7 @@
 
     /**
      * Create a new ServletRequestAndContext.
+     *
      * @param request ServletRequest
      * @param context ServletContext
      */
@@ -41,9 +43,6 @@
         this.request = request;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public HttpSession getSession() {
         return request instanceof HttpServletRequest
                 ? ((HttpServletRequest) request).getSession(false) : null;
@@ -51,6 +50,7 @@
 
     /**
      * Get the request.
+     *
      * @return ServletRequest
      */
     public ServletRequest getServletRequest() {

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletRequestHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletRequestHandler.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletRequestHandler.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletRequestHandler.java Fri May  2 10:46:46 2008
@@ -16,23 +16,21 @@
  */
 package org.apache.commons.jxpath.servlet;
 
+import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.HashSet;
-
 import javax.servlet.ServletRequest;
 
 /**
- * Implementation of the DynamicPropertyHandler interface that provides
- * access to attributes and parameters of a ServletRequest.
+ * Implementation of the {@link org.apache.commons.jxpath.DynamicPropertyHandler}
+ * interface that provides access to attributes and parameters
+ * of a {@link ServletRequest}.
  *
  * @author Dmitri Plotnikov
  * @version $Revision$ $Date$
  */
 public class ServletRequestHandler extends HttpSessionHandler {
 
-    /**
-     * {@inheritDoc}
-     */
     protected void collectPropertyNames(HashSet set, Object bean) {
         super.collectPropertyNames(set, bean);
         ServletRequestAndContext handle = (ServletRequestAndContext) bean;
@@ -47,13 +45,11 @@
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object getProperty(Object bean, String property) {
         ServletRequestAndContext handle = (ServletRequestAndContext) bean;
         ServletRequest servletRequest = handle.getServletRequest();
         String[] strings = servletRequest.getParameterValues(property);
+
         if (strings != null) {
             if (strings.length == 0) {
                 return null;
@@ -72,9 +68,6 @@
         return super.getProperty(bean, property);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public void setProperty(Object request, String property, Object value) {
         ((ServletRequest) request).setAttribute(property, value);
     }

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/BasicTypeConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/BasicTypeConverter.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/BasicTypeConverter.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/BasicTypeConverter.java Fri May  2 10:46:46 2008
@@ -484,23 +484,14 @@
            this.values = values;
         }
 
-        /**
-         * {@inheritDoc}
-         */
         public List getValues() {
             return Collections.unmodifiableList(values);
         }
 
-        /**
-         * {@inheritDoc}
-         */
         public List getNodes() {
             return Collections.unmodifiableList(values);
         }
 
-        /**
-         * {@inheritDoc}
-         */
         public List getPointers() {
             if (pointers == null) {
                 pointers = new ArrayList();
@@ -527,51 +518,30 @@
             this.bean = object;
         }
 
-        /**
-         * {@inheritDoc}
-         */
         public Object getValue() {
             return bean;
         }
 
-        /**
-         * {@inheritDoc}
-         */
         public Object getNode() {
             return bean;
         }
 
-        /**
-         * {@inheritDoc}
-         */
         public Object getRootNode() {
             return bean;
         }
 
-        /**
-         * {@inheritDoc}
-         */
         public void setValue(Object value) {
             throw new UnsupportedOperationException();
         }
 
-        /**
-         * {@inheritDoc}
-         */
         public Object clone() {
             return this;
         }
 
-        /**
-         * {@inheritDoc}
-         */
         public int compareTo(Object object) {
             return 0;
         }
 
-        /**
-         * {@inheritDoc}
-         */
         public String asPath() {
             if (bean == null) {
                 return "null()";
@@ -592,4 +562,4 @@
             return "{object of type " + bean.getClass().getName() + "}";
         }
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/JXPath11CompatibleTypeConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/JXPath11CompatibleTypeConverter.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/JXPath11CompatibleTypeConverter.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/JXPath11CompatibleTypeConverter.java Fri May  2 10:46:46 2008
@@ -19,23 +19,19 @@
 import org.apache.commons.jxpath.NodeSet;
 
 /**
- * TypeConverter implementation to circumvent automagic NodeSet decoding. Suggested by JIRA issue JXPATH-10.
+ * TypeConverter implementation to circumvent automagic {@link NodeSet}
+ * decoding. Suggested by JIRA issue JXPATH-10.
  *
  * @since JXPath 1.3
  * @author Matt Benson
  * @version $Revision$ $Date$
  */
 public class JXPath11CompatibleTypeConverter extends BasicTypeConverter {
-    /**
-     * {@inheritDoc}
-     */
+
     public boolean canConvert(Object object, Class toType) {
         return object instanceof NodeSet ? toType.isInstance(object) : super.canConvert(object, toType);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public Object convert(Object object, Class toType) {
         return object instanceof NodeSet && toType.isInstance(object) ? object : super.convert(object, toType);
     }

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/KeyManagerUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/KeyManagerUtils.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/KeyManagerUtils.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/KeyManagerUtils.java Fri May  2 10:46:46 2008
@@ -26,6 +26,7 @@
 
 /**
  * Utility class.
+ *
  * @author Matt Benson
  * @since JXPath 1.3
  * @version $Revision$ $Date$
@@ -46,9 +47,6 @@
             this.delegate = delegate;
         }
 
-        /**
-         * {@inheritDoc}
-         */
         public NodeSet getNodeSetByKey(JXPathContext context, String key,
                 Object value) {
             Pointer pointer = delegate.getPointerByKey(context, key, InfoSetUtil.stringValue(value));
@@ -57,9 +55,6 @@
             return result;
         }
 
-        /**
-         * {@inheritDoc}
-         */
         public Pointer getPointerByKey(JXPathContext context, String keyName,
                 String keyValue) {
             return delegate.getPointerByKey(context, keyName, keyValue);

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/MethodLookupUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/MethodLookupUtils.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/MethodLookupUtils.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/MethodLookupUtils.java Fri May  2 10:46:46 2008
@@ -316,4 +316,4 @@
 
         return NO_MATCH;
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/ReverseComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/ReverseComparator.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/ReverseComparator.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/ReverseComparator.java Fri May  2 10:46:46 2008
@@ -36,9 +36,6 @@
     private ReverseComparator() {
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public int compare(Object o1, Object o2) {
         return ((Comparable) o2).compareTo(o1);
     }

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/TypeConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/TypeConverter.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/TypeConverter.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/TypeConverter.java Fri May  2 10:46:46 2008
@@ -17,9 +17,9 @@
 package org.apache.commons.jxpath.util;
 
 /**
- * A type converter can be installed on TypeUtils to introduce
+ * A type converter can be installed on {@link TypeUtils} to introduce
  * additional type conversions for JXPath. Most of
- * the time BasicTypeConverter should be used as the superclass.
+ * the time {@link BasicTypeConverter} should be used as the superclass.
  *
  * @see TypeUtils#setTypeConverter
  *
@@ -46,4 +46,4 @@
      * @return resulting Object
      */
     Object convert(Object object, Class toType);
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/TypeUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/TypeUtils.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/TypeUtils.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/TypeUtils.java Fri May  2 10:46:46 2008
@@ -86,4 +86,4 @@
     public static Class wrapPrimitive(Class p) {
         return p.isPrimitive() ? (Class) PRIMITIVE_TYPE_MAP.get(p) : p;
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/ValueUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/ValueUtils.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/ValueUtils.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/ValueUtils.java Fri May  2 10:46:46 2008
@@ -658,4 +658,4 @@
         // Return whatever we have found
         return (method);
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/DOMParser.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/DOMParser.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/DOMParser.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/DOMParser.java Fri May  2 10:46:46 2008
@@ -30,9 +30,6 @@
  */
 public class DOMParser extends XMLParser2 {
 
-    /**
-     * {@inheritDoc}
-     */
     public Object parseXML(InputStream stream) {
         try {
             DocumentBuilderFactory factory =
@@ -51,4 +48,4 @@
             throw new JXPathException("DOM parser error", ex);
         }
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/DocumentContainer.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/DocumentContainer.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/DocumentContainer.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/DocumentContainer.java Fri May  2 10:46:46 2008
@@ -186,4 +186,4 @@
         }
         return parser;
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/JDOMParser.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/JDOMParser.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/JDOMParser.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/JDOMParser.java Fri May  2 10:46:46 2008
@@ -29,9 +29,6 @@
  */
 public class JDOMParser extends XMLParser2 {
 
-    /**
-     * {@inheritDoc}
-     */
     public Object parseXML(InputStream stream) {
         if (!isNamespaceAware()) {
             throw new JXPathException("JDOM parser configuration error. JDOM "
@@ -50,4 +47,4 @@
             throw new JXPathException("JDOM parser error", ex);
         }
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/XMLParser.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/XMLParser.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/XMLParser.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/XMLParser.java Fri May  2 10:46:46 2008
@@ -34,4 +34,4 @@
      * @return Object
      */
     Object parseXML(InputStream stream);
-}
\ No newline at end of file
+}



Mime
View raw message