Camel case

Author: garydgregory

src/main/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java

@@ -598,11 +598,11 @@ public Object getValue(final String xpath, final Expression expr, final Class re
     /**
      * Gets a VariablePointer for the given variable name.
      * 
-     * @param name variable name
+     * @param qName variable name
      * @return NodePointer
      */
-    public NodePointer getVariablePointer(final QName name) {
-        return NodePointer.newNodePointer(name, VariablePointerFactory.contextWrapper(this), getLocale());
+    public NodePointer getVariablePointer(final QName qName) {
+        return NodePointer.newNodePointer(qName, VariablePointerFactory.contextWrapper(this), getLocale());
     }
 
     /**

src/main/java/org/apache/commons/jxpath/ri/axes/AttributeContext.java

@@ -58,16 +58,16 @@ public boolean nextNode() {
         super.setPosition(getCurrentPosition() + 1);
         if (!setStarted) {
             setStarted = true;
-            QName name;
+            QName qName;
             if (nodeTest instanceof NodeNameTest) {
-                name = ((NodeNameTest) nodeTest).getNodeName();
+                qName = ((NodeNameTest) nodeTest).getNodeName();
             } else if (nodeTest instanceof NodeTypeTest && ((NodeTypeTest) nodeTest).getNodeType() == Compiler.NODE_TYPE_NODE) {
-                name = WILDCARD;
+                qName = WILDCARD;
             } else {
                 iterator = null;
                 return false;
             }
-            iterator = parentContext.getCurrentNodePointer().attributeIterator(name);
+            iterator = parentContext.getCurrentNodePointer().attributeIterator(qName);
         }
         if (iterator == null) {
             return false;

src/main/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreter.java

@@ -82,13 +82,13 @@ private static int computeQuality(NodePointer pointer) {
     private static NodePointer createChildPointerForStep(final PropertyOwnerPointer parentPointer, final Step step) {
         final int axis = step.getAxis();
         if (axis == Compiler.AXIS_CHILD || axis == Compiler.AXIS_ATTRIBUTE) {
-            final QName name = ((NodeNameTest) step.getNodeTest()).getNodeName();
-            if (axis == Compiler.AXIS_ATTRIBUTE && isLangAttribute(name)) {
+            final QName qName = ((NodeNameTest) step.getNodeTest()).getNodeName();
+            if (axis == Compiler.AXIS_ATTRIBUTE && isLangAttribute(qName)) {
                 return new LangAttributePointer(parentPointer);
             }
-            if (parentPointer.isValidProperty(name)) {
+            if (parentPointer.isValidProperty(qName)) {
                 final NodePointer childPointer = parentPointer.getPropertyPointer();
-                ((PropertyPointer) childPointer).setPropertyName(name.toString());
+                ((PropertyPointer) childPointer).setPropertyName(qName.toString());
                 childPointer.setAttribute(axis == Compiler.AXIS_ATTRIBUTE);
                 return childPointer;
             }
@@ -116,8 +116,8 @@ public static NodePointer createNullPointer(final EvalContext context, NodePoint
         final int axis = step.getAxis();
         if (axis == Compiler.AXIS_CHILD || axis == Compiler.AXIS_ATTRIBUTE) {
             final NullPropertyPointer pointer = new NullPropertyPointer(parent);
-            final QName name = ((NodeNameTest) step.getNodeTest()).getNodeName();
-            pointer.setPropertyName(name.toString());
+            final QName qName = ((NodeNameTest) step.getNodeTest()).getNodeName();
+            pointer.setPropertyName(qName.toString());
             pointer.setAttribute(axis == Compiler.AXIS_ATTRIBUTE);
             parent = pointer;
         }
@@ -655,11 +655,11 @@ private static boolean isCollectionElement(final NodePointer pointer, final int
     /**
      * Learn whether {@code name} is a lang attribute.
      * 
-     * @param name to compare
+     * @param qName to compare
      * @return boolean
      */
-    private static boolean isLangAttribute(final QName name) {
-        return name.getPrefix() != null && name.getPrefix().equals("xml") && name.getName().equals("lang");
+    private static boolean isLangAttribute(final QName qName) {
+        return qName.getPrefix() != null && qName.getPrefix().equals("xml") && qName.getName().equals("lang");
     }
 
     /**

src/main/java/org/apache/commons/jxpath/ri/model/NodePointer.java

@@ -53,14 +53,14 @@ public abstract class NodePointer implements Pointer {
      * Allocates an new child NodePointer by iterating through all installed NodePointerFactories until it finds one that can create a pointer.
      *
      * @param parent pointer
-     * @param name   QName
+     * @param qName   QName
      * @param bean   Object
      * @return NodePointer
      */
-    public static NodePointer newChildNodePointer(final NodePointer parent, final QName name, final Object bean) {
+    public static NodePointer newChildNodePointer(final NodePointer parent, final QName qName, final Object bean) {
         final NodePointerFactory[] factories = JXPathContextReferenceImpl.getNodePointerFactories();
         for (final NodePointerFactory element : factories) {
-            final NodePointer pointer = element.createNodePointer(parent, name, bean);
+            final NodePointer pointer = element.createNodePointer(parent, qName, bean);
             if (pointer != null) {
                 return pointer;
             }
@@ -71,20 +71,20 @@ public static NodePointer newChildNodePointer(final NodePointer parent, final QN
     /**
      * Allocates an entirely new NodePointer by iterating through all installed NodePointerFactories until it finds one that can create a pointer.
      *
-     * @param name   QName
+     * @param qName   QName
      * @param bean   Object
      * @param locale Locale
      * @return NodePointer
      */
-    public static NodePointer newNodePointer(final QName name, final Object bean, final Locale locale) {
+    public static NodePointer newNodePointer(final QName qName, final Object bean, final Locale locale) {
         NodePointer pointer;
         if (bean == null) {
-            pointer = new NullPointer(name, locale);
+            pointer = new NullPointer(qName, locale);
             return pointer;
         }
         final NodePointerFactory[] factories = JXPathContextReferenceImpl.getNodePointerFactories();
         for (final NodePointerFactory element : factories) {
-            pointer = element.createNodePointer(name, bean, locale);
+            pointer = element.createNodePointer(qName, bean, locale);
             if (pointer != null) {
                 return pointer;
             }
@@ -336,40 +336,40 @@ public int compareTo(final Object object) {
      * Called to create a non-existing attribute
      *
      * @param context the owning JXPathCOntext
-     * @param name    the QName at which an attribute should be created
+     * @param qName    the QName at which an attribute should be created
      * @return created NodePointer
      */
-    public NodePointer createAttribute(final JXPathContext context, final QName name) {
-        throw new JXPathException("Cannot create an attribute for path " + asPath() + "/@" + name + ", operation is not allowed for this type of node");
+    public NodePointer createAttribute(final JXPathContext context, final QName qName) {
+        throw new JXPathException("Cannot create an attribute for path " + asPath() + "/@" + qName + ", operation is not allowed for this type of node");
     }
 
     /**
      * Called by a child pointer when it needs to create a parent object for a non-existent collection element. It may have to expand the collection, then
      * create an element object and return a new pointer describing the newly created element.
      *
      * @param context the owning JXPathCOntext
-     * @param name    the QName at which a child should be created
+     * @param qName    the QName at which a child should be created
      * @param index   child index.
      * @return created NodePointer
      */
-    public NodePointer createChild(final JXPathContext context, final QName name, final int index) {
+    public NodePointer createChild(final JXPathContext context, final QName qName, final int index) {
         throw new JXPathException(
-                "Cannot create an object for path " + asPath() + "/" + name + "[" + (index + 1) + "]" + ", operation is not allowed for this type of node");
+                "Cannot create an object for path " + asPath() + "/" + qName + "[" + (index + 1) + "]" + ", operation is not allowed for this type of node");
     }
 
     /**
      * Called by a child pointer if that child needs to assign the value supplied in the createPath(context, value) call to a non-existent node. This method may
      * have to expand the collection in order to assign the element.
      *
      * @param context the owning JXPathCOntext
-     * @param name    the QName at which a child should be created
+     * @param qName    the QName at which a child should be created
      * @param index   child index.
      * @param value   node value to set
      * @return created NodePointer
      */
-    public NodePointer createChild(final JXPathContext context, final QName name, final int index, final Object value) {
+    public NodePointer createChild(final JXPathContext context, final QName qName, final int index, final Object value) {
         throw new JXPathException(
-                "Cannot create an object for path " + asPath() + "/" + name + "[" + (index + 1) + "]" + ", operation is not allowed for this type of node");
+                "Cannot create an object for path " + asPath() + "/" + qName + "[" + (index + 1) + "]" + ", operation is not allowed for this type of node");
     }
 
     /**

src/main/java/org/apache/commons/jxpath/ri/model/NodePointerFactory.java

@@ -31,21 +31,21 @@ public interface NodePointerFactory {
      * Create a NodePointer for the supplied child object.
      *
      * @param parent parent node
-     * @param name   String node name
+     * @param qName  node name
      * @param object child object
      * @return null if this factory does not recognize objects of the supplied type.
      */
-    NodePointer createNodePointer(NodePointer parent, QName name, Object object);
+    NodePointer createNodePointer(NodePointer parent, QName qName, Object object);
 
     /**
      * Create a NodePointer for the supplied object. The node will represent the "root" object for a path.
      *
-     * @param name   String node name
+     * @param qName  node name
      * @param object child object
      * @param locale Locale
      * @return null if this factory does not recognize objects of the supplied type.
      */
-    NodePointer createNodePointer(QName name, Object object, Locale locale);
+    NodePointer createNodePointer(QName qName, Object object, Locale locale);
 
     /**
      * The factory order number determines its position between other factories.

src/main/java/org/apache/commons/jxpath/ri/model/VariablePointer.java

@@ -44,7 +44,7 @@ public class VariablePointer extends NodePointer {
     /**
      * Qualified name.
      */
-    private final QName name;
+    private final QName qName;
 
     /**
      * Value pointer.
@@ -59,32 +59,32 @@ public class VariablePointer extends NodePointer {
     /**
      * Constructs a new (non-actual) VariablePointer.
      *
-     * @param name variable name
+     * @param qName variable name
      */
-    public VariablePointer(final QName name) {
+    public VariablePointer(final QName qName) {
         super(null);
-        this.name = name;
+        this.qName = qName;
         actual = false;
     }
 
     /**
      * Constructs a new VariablePointer.
      *
      * @param variables Variables instance
-     * @param name      variable name
+     * @param qName      variable name
      */
-    public VariablePointer(final Variables variables, final QName name) {
+    public VariablePointer(final Variables variables, final QName qName) {
         super(null);
         this.variables = variables;
-        this.name = name;
+        this.qName = qName;
         actual = true;
     }
 
     @Override
     public String asPath() {
         final StringBuilder buffer = new StringBuilder();
         buffer.append('$');
-        buffer.append(name);
+        buffer.append(qName);
         if (!actual) {
             if (index != WHOLE_COLLECTION) {
                 buffer.append('[').append(index + 1).append(']');
@@ -96,8 +96,8 @@ public String asPath() {
     }
 
     @Override
-    public NodeIterator attributeIterator(final QName name) {
-        return getValuePointer().attributeIterator(name);
+    public NodeIterator attributeIterator(final QName qName) {
+        return getValuePointer().attributeIterator(qName);
     }
 
     @Override
@@ -111,7 +111,7 @@ public int compareChildNodePointers(final NodePointer pointer1, final NodePointe
     }
 
     @Override
-    public NodePointer createChild(final JXPathContext context, final QName name, final int index) {
+    public NodePointer createChild(final JXPathContext context, final QName qName, final int index) {
         final Object collection = createCollection(context, index);
         if (!isActual() || index != 0 && index != WHOLE_COLLECTION) {
             final AbstractFactory factory = getAbstractFactory(context);
@@ -127,7 +127,7 @@ public NodePointer createChild(final JXPathContext context, final QName name, fi
     }
 
     @Override
-    public NodePointer createChild(final JXPathContext context, final QName name, final int index, final Object value) {
+    public NodePointer createChild(final JXPathContext context, final QName qName, final int index, final Object value) {
         final Object collection = createCollection(context, index);
         ValueUtils.setValue(collection, index, value);
         final NodePointer cl = (NodePointer) clone();
@@ -146,7 +146,7 @@ private Object createCollection(final JXPathContext context, int index) {
         createPath(context);
         Object collection = getBaseValue();
         if (collection == null) {
-            throw new JXPathAbstractFactoryException("Factory did not assign a collection to variable '" + name + "' for path: " + asPath());
+            throw new JXPathAbstractFactoryException("Factory did not assign a collection to variable '" + qName + "' for path: " + asPath());
         }
         if (index == WHOLE_COLLECTION) {
             index = 0;
@@ -155,7 +155,7 @@ private Object createCollection(final JXPathContext context, int index) {
         }
         if (index >= getLength()) {
             collection = ValueUtils.expandCollection(collection, index + 1);
-            variables.declareVariable(name.toString(), collection);
+            variables.declareVariable(qName.toString(), collection);
         }
         return collection;
     }
@@ -164,8 +164,8 @@ private Object createCollection(final JXPathContext context, int index) {
     public NodePointer createPath(final JXPathContext context) {
         if (!actual) {
             final AbstractFactory factory = getAbstractFactory(context);
-            if (!factory.declareVariable(context, name.toString())) {
-                throw new JXPathAbstractFactoryException("Factory cannot define variable '" + name + "' for path: " + asPath());
+            if (!factory.declareVariable(context, qName.toString())) {
+                throw new JXPathAbstractFactoryException("Factory cannot define variable '" + qName + "' for path: " + asPath());
             }
             findVariables(context);
             // Assert: actual == true
@@ -193,7 +193,7 @@ public boolean equals(final Object object) {
             return false;
         }
         final VariablePointer other = (VariablePointer) object;
-        return variables == other.variables && name.equals(other.name) && index == other.index;
+        return variables == other.variables && qName.equals(other.qName) && index == other.index;
     }
 
     /**
@@ -206,7 +206,7 @@ protected void findVariables(final JXPathContext context) {
         JXPathContext varCtx = context;
         while (varCtx != null) {
             variables = varCtx.getVariables();
-            if (variables.isDeclaredVariable(name.toString())) {
+            if (variables.isDeclaredVariable(qName.toString())) {
                 actual = true;
                 break;
             }
@@ -218,9 +218,9 @@ protected void findVariables(final JXPathContext context) {
     @Override
     public Object getBaseValue() {
         if (!actual) {
-            throw new JXPathException("Undefined variable: " + name);
+            throw new JXPathException("Undefined variable: " + qName);
         }
-        return variables.getVariable(name.toString());
+        return variables.getVariable(qName.toString());
     }
 
     @Override
@@ -240,7 +240,7 @@ public NodePointer getImmediateValuePointer() {
 
                     @Override
                     public Object getImmediateNode() {
-                        throw new JXPathException("Undefined variable: " + name);
+                        throw new JXPathException("Undefined variable: " + qName);
                     }
                 };
             }
@@ -261,12 +261,12 @@ public int getLength() {
 
     @Override
     public QName getName() {
-        return name;
+        return qName;
     }
 
     @Override
     public int hashCode() {
-        return (actual ? System.identityHashCode(variables) : 0) + name.hashCode() + index;
+        return (actual ? System.identityHashCode(variables) : 0) + qName.hashCode() + index;
     }
 
     @Override
@@ -305,15 +305,15 @@ public NodePointer namespacePointer(final String name) {
     public void remove() {
         if (actual) {
             if (index == WHOLE_COLLECTION) {
-                variables.undeclareVariable(name.toString());
+                variables.undeclareVariable(qName.toString());
             } else {
                 if (index < 0) {
                     throw new JXPathInvalidAccessException("Index is less than 1: " + asPath());
                 }
                 Object collection = getBaseValue();
                 if (collection != null && index < getLength()) {
                     collection = ValueUtils.remove(collection, index);
-                    variables.declareVariable(name.toString(), collection);
+                    variables.declareVariable(qName.toString(), collection);
                 }
             }
         }
@@ -328,14 +328,14 @@ public void setIndex(final int index) {
     @Override
     public void setValue(final Object value) {
         if (!actual) {
-            throw new JXPathException("Cannot set undefined variable: " + name);
+            throw new JXPathException("Cannot set undefined variable: " + qName);
         }
         valuePointer = null;
         if (index != WHOLE_COLLECTION) {
             final Object collection = getBaseValue();
             ValueUtils.setValue(collection, index, value);
         } else {
-            variables.declareVariable(name.toString(), value);
+            variables.declareVariable(qName.toString(), value);
         }
     }