You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2025/03/20 13:19:30 UTC
(commons-jxpath) 06/08: Camel case
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jxpath.git
commit b90e8a1d080f22440868183813bec4372bddf311
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Thu Mar 20 09:10:24 2025 -0400
Camel case
---
.../jxpath/ri/JXPathContextReferenceImpl.java | 6 +--
.../commons/jxpath/ri/axes/AttributeContext.java | 8 ++--
.../jxpath/ri/axes/SimplePathInterpreter.java | 18 ++++----
.../commons/jxpath/ri/model/NodePointer.java | 32 ++++++-------
.../jxpath/ri/model/NodePointerFactory.java | 8 ++--
.../commons/jxpath/ri/model/VariablePointer.java | 54 +++++++++++-----------
.../jxpath/ri/model/VariablePointerFactory.java | 12 ++---
.../ri/model/beans/BeanAttributeIterator.java | 8 ++--
.../commons/jxpath/ri/model/beans/BeanPointer.java | 20 ++++----
.../jxpath/ri/model/beans/BeanPointerFactory.java | 10 ++--
.../beans/CollectionAttributeNodeIterator.java | 10 ++--
.../jxpath/ri/model/beans/CollectionPointer.java | 8 ++--
.../ri/model/beans/CollectionPointerFactory.java | 4 +-
.../commons/jxpath/ri/model/beans/NullPointer.java | 8 ++--
.../jxpath/ri/model/beans/NullPropertyPointer.java | 8 ++--
.../ri/model/beans/PropertyOwnerPointer.java | 10 ++--
.../jxpath/ri/model/beans/PropertyPointer.java | 12 ++---
.../ri/model/container/ContainerPointer.java | 4 +-
.../model/container/ContainerPointerFactory.java | 4 +-
.../jxpath/ri/model/dom/DOMAttributeIterator.java | 26 +++++------
.../jxpath/ri/model/dom/DOMNodePointer.java | 32 ++++++-------
.../jxpath/ri/model/dom/DOMPointerFactory.java | 4 +-
.../jxpath/ri/model/dom/NamespacePointer.java | 20 +++++---
.../jxpath/ri/model/dynabeans/DynaBeanPointer.java | 20 ++++----
.../ri/model/dynabeans/DynaBeanPointerFactory.java | 8 ++--
.../StrictLazyDynaBeanPointerFactory.java | 20 ++++----
.../ri/model/dynamic/DynamicAttributeIterator.java | 6 +--
.../jxpath/ri/model/dynamic/DynamicPointer.java | 24 +++++-----
.../ri/model/dynamic/DynamicPointerFactory.java | 10 ++--
.../ri/model/jdom/JDOMAttributeIterator.java | 8 ++--
.../jxpath/ri/model/jdom/JDOMNodePointer.java | 34 +++++++-------
.../jxpath/ri/model/jdom/JDOMPointerFactory.java | 4 +-
32 files changed, 234 insertions(+), 226 deletions(-)
diff --git a/src/main/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java b/src/main/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java
index 101175c..3fe49c2 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java
@@ -598,11 +598,11 @@ public class JXPathContextReferenceImpl extends JXPathContext {
/**
* 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());
}
/**
diff --git a/src/main/java/org/apache/commons/jxpath/ri/axes/AttributeContext.java b/src/main/java/org/apache/commons/jxpath/ri/axes/AttributeContext.java
index dc3807f..bcd9b10 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/axes/AttributeContext.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/axes/AttributeContext.java
@@ -58,16 +58,16 @@ public class AttributeContext extends EvalContext {
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;
diff --git a/src/main/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreter.java b/src/main/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreter.java
index 38b5c60..68889ea 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreter.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreter.java
@@ -82,13 +82,13 @@ public class SimplePathInterpreter {
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 class SimplePathInterpreter {
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 @@ public class SimplePathInterpreter {
/**
* 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");
}
/**
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/NodePointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/NodePointer.java
index 891a0ee..980caee 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/NodePointer.java
+++ b/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 abstract class NodePointer implements Pointer {
/**
* 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,11 +336,11 @@ public abstract class NodePointer implements Pointer {
* 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");
}
/**
@@ -348,13 +348,13 @@ public abstract class NodePointer implements Pointer {
* 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");
}
/**
@@ -362,14 +362,14 @@ public abstract class NodePointer implements Pointer {
* 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");
}
/**
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/NodePointerFactory.java b/src/main/java/org/apache/commons/jxpath/ri/model/NodePointerFactory.java
index 7460300..7168ad7 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/NodePointerFactory.java
+++ b/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.
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/VariablePointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/VariablePointer.java
index d65bdcf..2dd1e24 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/VariablePointer.java
+++ b/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,11 +59,11 @@ 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;
}
@@ -71,12 +71,12 @@ public class VariablePointer extends NodePointer {
* 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;
}
@@ -84,7 +84,7 @@ public class VariablePointer extends NodePointer {
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 class VariablePointer extends NodePointer {
}
@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 class VariablePointer extends NodePointer {
}
@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 class VariablePointer extends NodePointer {
}
@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 @@ public class VariablePointer extends NodePointer {
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 @@ public class VariablePointer extends NodePointer {
}
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 @@ public class VariablePointer extends NodePointer {
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 class VariablePointer extends NodePointer {
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 @@ public class VariablePointer extends NodePointer {
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 @@ public class VariablePointer extends NodePointer {
@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 class VariablePointer extends NodePointer {
@Override
public Object getImmediateNode() {
- throw new JXPathException("Undefined variable: " + name);
+ throw new JXPathException("Undefined variable: " + qName);
}
};
}
@@ -261,12 +261,12 @@ public class VariablePointer extends NodePointer {
@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,7 +305,7 @@ public class VariablePointer extends NodePointer {
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());
@@ -313,7 +313,7 @@ public class VariablePointer extends NodePointer {
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 class VariablePointer extends NodePointer {
@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);
}
}
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/VariablePointerFactory.java b/src/main/java/org/apache/commons/jxpath/ri/model/VariablePointerFactory.java
index 4c8f111..d9b707d 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/VariablePointerFactory.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/VariablePointerFactory.java
@@ -77,25 +77,25 @@ public class VariablePointerFactory implements NodePointerFactory {
}
@Override
- public NodePointer createNodePointer(final NodePointer parent, final QName name, final Object object) {
- return createNodePointer(name, object, null);
+ public NodePointer createNodePointer(final NodePointer parent, final QName qName, final Object object) {
+ return createNodePointer(qName, object, null);
}
@Override
- public NodePointer createNodePointer(final QName name, final Object object, final Locale locale) {
+ public NodePointer createNodePointer(final QName qName, final Object object, final Locale locale) {
if (object instanceof VariableContextWrapper) {
JXPathContext varCtx = ((VariableContextWrapper) object).getContext();
while (varCtx != null) {
final Variables vars = varCtx.getVariables();
- if (vars.isDeclaredVariable(name.toString())) {
- return new VariablePointer(vars, name);
+ if (vars.isDeclaredVariable(qName.toString())) {
+ return new VariablePointer(vars, qName);
}
varCtx = varCtx.getParentContext();
}
// The variable is not declared, but we will create
// a pointer anyway in case the user wants to set, rather
// than get, the value of the variable.
- return new VariablePointer(name);
+ return new VariablePointer(qName);
}
return null;
}
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/beans/BeanAttributeIterator.java b/src/main/java/org/apache/commons/jxpath/ri/model/beans/BeanAttributeIterator.java
index 8896c5f..6a448ab 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/beans/BeanAttributeIterator.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/beans/BeanAttributeIterator.java
@@ -33,12 +33,12 @@ public class BeanAttributeIterator extends PropertyIterator {
* Constructs a new BeanAttributeIterator.
*
* @param parent parent pointer
- * @param name name of this bean
+ * @param qName name of this bean
*/
- public BeanAttributeIterator(final PropertyOwnerPointer parent, final QName name) {
- super(parent, name.getPrefix() == null && (name.getName() == null || name.getName().equals("*")) ? null : name.toString(), false, null);
+ public BeanAttributeIterator(final PropertyOwnerPointer parent, final QName qName) {
+ super(parent, qName.getPrefix() == null && (qName.getName() == null || qName.getName().equals("*")) ? null : qName.toString(), false, null);
this.parent = parent;
- includeXmlLang = name.getPrefix() != null && name.getPrefix().equals("xml") && (name.getName().equals("lang") || name.getName().equals("*"));
+ includeXmlLang = qName.getPrefix() != null && qName.getPrefix().equals("xml") && (qName.getName().equals("lang") || qName.getName().equals("*"));
}
@Override
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/beans/BeanPointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/beans/BeanPointer.java
index bbf1170..398451a 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/beans/BeanPointer.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/beans/BeanPointer.java
@@ -35,7 +35,7 @@ public class BeanPointer extends PropertyOwnerPointer {
/**
* Qualified name.
*/
- private final QName name;
+ private final QName qName;
/**
* Bean.
@@ -51,13 +51,13 @@ public class BeanPointer extends PropertyOwnerPointer {
* BeanPointer a new BeanPointer.
*
* @param parent pointer
- * @param name is the name given to the first node
+ * @param qName is the name given to the first node
* @param bean pointed
* @param beanInfo JXPathBeanInfo
*/
- public BeanPointer(final NodePointer parent, final QName name, final Object bean, final JXPathBeanInfo beanInfo) {
+ public BeanPointer(final NodePointer parent, final QName qName, final Object bean, final JXPathBeanInfo beanInfo) {
super(parent);
- this.name = name;
+ this.qName = qName;
this.bean = bean;
this.beanInfo = beanInfo;
}
@@ -65,14 +65,14 @@ public class BeanPointer extends PropertyOwnerPointer {
/**
* Constructs a new BeanPointer.
*
- * @param name is the name given to the first node
+ * @param qName is the name given to the first node
* @param bean pointed
* @param beanInfo JXPathBeanInfo
* @param locale Locale
*/
- public BeanPointer(final QName name, final Object bean, final JXPathBeanInfo beanInfo, final Locale locale) {
+ public BeanPointer(final QName qName, final Object bean, final JXPathBeanInfo beanInfo, final Locale locale) {
super(null, locale);
- this.name = name;
+ this.qName = qName;
this.bean = bean;
this.beanInfo = beanInfo;
}
@@ -117,7 +117,7 @@ public class BeanPointer extends PropertyOwnerPointer {
if (parent != other.parent && (parent == null || !parent.equals(other.parent))) {
return false;
}
- if (name == null && other.name != null || name != null && !name.equals(other.name)) {
+ if (qName == null && other.qName != null || qName != null && !qName.equals(other.qName)) {
return false;
}
final int iThis = index == WHOLE_COLLECTION ? 0 : index;
@@ -148,7 +148,7 @@ public class BeanPointer extends PropertyOwnerPointer {
@Override
public QName getName() {
- return name;
+ return qName;
}
@Override
@@ -158,7 +158,7 @@ public class BeanPointer extends PropertyOwnerPointer {
@Override
public int hashCode() {
- return name == null ? 0 : name.hashCode();
+ return qName == null ? 0 : qName.hashCode();
}
/**
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/beans/BeanPointerFactory.java b/src/main/java/org/apache/commons/jxpath/ri/model/beans/BeanPointerFactory.java
index 11e47aa..81faddb 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/beans/BeanPointerFactory.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/beans/BeanPointerFactory.java
@@ -41,18 +41,18 @@ public class BeanPointerFactory implements NodePointerFactory {
}
@Override
- public NodePointer createNodePointer(final NodePointer parent, final QName name, final Object bean) {
+ public NodePointer createNodePointer(final NodePointer parent, final QName qName, final Object bean) {
if (bean == null) {
- return new NullPointer(parent, name);
+ return new NullPointer(parent, qName);
}
final JXPathBeanInfo bi = JXPathIntrospector.getBeanInfo(bean.getClass());
- return new BeanPointer(parent, name, bean, bi);
+ return new BeanPointer(parent, qName, bean, bi);
}
@Override
- public NodePointer createNodePointer(final QName name, final Object bean, final Locale locale) {
+ public NodePointer createNodePointer(final QName qName, final Object bean, final Locale locale) {
final JXPathBeanInfo bi = JXPathIntrospector.getBeanInfo(bean.getClass());
- return new BeanPointer(name, bean, bi, locale);
+ return new BeanPointer(qName, bean, bi, locale);
}
@Override
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/beans/CollectionAttributeNodeIterator.java b/src/main/java/org/apache/commons/jxpath/ri/model/beans/CollectionAttributeNodeIterator.java
index 5c29edb..a971eab 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/beans/CollectionAttributeNodeIterator.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/beans/CollectionAttributeNodeIterator.java
@@ -26,21 +26,21 @@ import org.apache.commons.jxpath.ri.model.NodePointer;
*/
public class CollectionAttributeNodeIterator extends CollectionNodeIterator {
- private final QName name;
+ private final QName qName;
/**
* Constructs a new CollectionAttributeNodeIterator.
*
* @param pointer collection pointer
- * @param name attribute name
+ * @param qName attribute name
*/
- public CollectionAttributeNodeIterator(final CollectionPointer pointer, final QName name) {
+ public CollectionAttributeNodeIterator(final CollectionPointer pointer, final QName qName) {
super(pointer, false, null);
- this.name = name;
+ this.qName = qName;
}
@Override
protected NodeIterator getElementNodeIterator(final NodePointer elementPointer) {
- return elementPointer.attributeIterator(name);
+ return elementPointer.attributeIterator(qName);
}
}
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/beans/CollectionPointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/beans/CollectionPointer.java
index f13c876..247c869 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/beans/CollectionPointer.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/beans/CollectionPointer.java
@@ -91,8 +91,8 @@ public class CollectionPointer extends NodePointer {
}
@Override
- public NodeIterator attributeIterator(final QName name) {
- return index == WHOLE_COLLECTION ? new CollectionAttributeNodeIterator(this, name) : getValuePointer().attributeIterator(name);
+ public NodeIterator attributeIterator(final QName qName) {
+ return index == WHOLE_COLLECTION ? new CollectionAttributeNodeIterator(this, qName) : getValuePointer().attributeIterator(qName);
}
@Override
@@ -109,14 +109,14 @@ public class CollectionPointer extends NodePointer {
}
@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 NodePointer ptr = (NodePointer) clone();
ptr.setIndex(index);
return ptr.createPath(context);
}
@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 NodePointer ptr = (NodePointer) clone();
ptr.setIndex(index);
return ptr.createPath(context, value);
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/beans/CollectionPointerFactory.java b/src/main/java/org/apache/commons/jxpath/ri/model/beans/CollectionPointerFactory.java
index 51e9170..9e8637b 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/beans/CollectionPointerFactory.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/beans/CollectionPointerFactory.java
@@ -40,12 +40,12 @@ public class CollectionPointerFactory implements NodePointerFactory {
}
@Override
- public NodePointer createNodePointer(final NodePointer parent, final QName name, final Object bean) {
+ public NodePointer createNodePointer(final NodePointer parent, final QName qName, final Object bean) {
return ValueUtils.isCollection(bean) ? new CollectionPointer(parent, bean) : null;
}
@Override
- public NodePointer createNodePointer(final QName name, final Object bean, final Locale locale) {
+ public NodePointer createNodePointer(final QName qName, final Object bean, final Locale locale) {
return ValueUtils.isCollection(bean) ? new CollectionPointer(bean, locale) : null;
}
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/beans/NullPointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/beans/NullPointer.java
index c019c46..1ee399b 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/beans/NullPointer.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/beans/NullPointer.java
@@ -85,13 +85,13 @@ public class NullPointer extends PropertyOwnerPointer {
}
@Override
- public NodePointer createChild(final JXPathContext context, final QName name, final int index) {
- return createPath(context).createChild(context, name, index);
+ public NodePointer createChild(final JXPathContext context, final QName qName, final int index) {
+ return createPath(context).createChild(context, qName, index);
}
@Override
- public NodePointer createChild(final JXPathContext context, final QName name, final int index, final Object value) {
- return createPath(context).createChild(context, name, index, value);
+ public NodePointer createChild(final JXPathContext context, final QName qName, final int index, final Object value) {
+ return createPath(context).createChild(context, qName, index, value);
}
@Override
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/beans/NullPropertyPointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/beans/NullPropertyPointer.java
index 70a6fd3..48c4d9e 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/beans/NullPropertyPointer.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/beans/NullPropertyPointer.java
@@ -78,13 +78,13 @@ public class NullPropertyPointer extends PropertyPointer {
}
@Override
- public NodePointer createChild(final JXPathContext context, final QName name, final int index) {
- return createPath(context).createChild(context, name, index);
+ public NodePointer createChild(final JXPathContext context, final QName qName, final int index) {
+ return createPath(context).createChild(context, qName, index);
}
@Override
- public NodePointer createChild(final JXPathContext context, final QName name, final int index, final Object value) {
- return createPath(context).createChild(context, name, index, value);
+ public NodePointer createChild(final JXPathContext context, final QName qName, final int index, final Object value) {
+ return createPath(context).createChild(context, qName, index, value);
}
@Override
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/beans/PropertyOwnerPointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/beans/PropertyOwnerPointer.java
index 00a6299..8e68820 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/beans/PropertyOwnerPointer.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/beans/PropertyOwnerPointer.java
@@ -62,8 +62,8 @@ public abstract class PropertyOwnerPointer extends NodePointer {
}
@Override
- public NodeIterator attributeIterator(final QName name) {
- return new BeanAttributeIterator(this, name);
+ public NodeIterator attributeIterator(final QName qName) {
+ return new BeanAttributeIterator(this, qName);
}
@Override
@@ -132,12 +132,12 @@ public abstract class PropertyOwnerPointer extends NodePointer {
/**
* Learn whether {@code name} is a valid child name for this PropertyOwnerPointer.
*
- * @param name the QName to test
+ * @param qName the QName to test
* @return {@code true} if {@code QName} is a valid property name.
* @since JXPath 1.3
*/
- public boolean isValidProperty(final QName name) {
- return isDefaultNamespace(name.getPrefix());
+ public boolean isValidProperty(final QName qName) {
+ return isDefaultNamespace(qName.getPrefix());
}
/**
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/beans/PropertyPointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/beans/PropertyPointer.java
index 8b7940c..8be2980 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/beans/PropertyPointer.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/beans/PropertyPointer.java
@@ -63,20 +63,20 @@ public abstract class PropertyPointer extends NodePointer {
}
@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 PropertyPointer prop = (PropertyPointer) clone();
- if (name != null) {
- prop.setPropertyName(name.toString());
+ if (qName != null) {
+ prop.setPropertyName(qName.toString());
}
prop.setIndex(index);
return prop.createPath(context);
}
@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 PropertyPointer prop = (PropertyPointer) clone();
- if (name != null) {
- prop.setPropertyName(name.toString());
+ if (qName != null) {
+ prop.setPropertyName(qName.toString());
}
prop.setIndex(index);
return prop.createPath(context, value);
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/container/ContainerPointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/container/ContainerPointer.java
index 84fc83f..4d751f1 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/container/ContainerPointer.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/container/ContainerPointer.java
@@ -71,8 +71,8 @@ public class ContainerPointer extends NodePointer {
}
@Override
- public NodeIterator attributeIterator(final QName name) {
- return getValuePointer().attributeIterator(name);
+ public NodeIterator attributeIterator(final QName qName) {
+ return getValuePointer().attributeIterator(qName);
}
@Override
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/container/ContainerPointerFactory.java b/src/main/java/org/apache/commons/jxpath/ri/model/container/ContainerPointerFactory.java
index d009e61..52852fd 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/container/ContainerPointerFactory.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/container/ContainerPointerFactory.java
@@ -40,12 +40,12 @@ public class ContainerPointerFactory implements NodePointerFactory {
}
@Override
- public NodePointer createNodePointer(final NodePointer parent, final QName name, final Object bean) {
+ public NodePointer createNodePointer(final NodePointer parent, final QName qName, final Object bean) {
return bean instanceof Container ? new ContainerPointer(parent, (Container) bean) : null;
}
@Override
- public NodePointer createNodePointer(final QName name, final Object bean, final Locale locale) {
+ public NodePointer createNodePointer(final QName qName, final Object bean, final Locale locale) {
return bean instanceof Container ? new ContainerPointer((Container) bean, locale) : null;
}
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributeIterator.java b/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributeIterator.java
index 6aca108..6eb6a41 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributeIterator.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributeIterator.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Node;
public class DOMAttributeIterator implements NodeIterator {
private final NodePointer parent;
- private final QName name;
+ private final QName qName;
private final List<Attr> attributes;
private int position;
@@ -43,17 +43,17 @@ public class DOMAttributeIterator implements NodeIterator {
* Constructs a new DOMAttributeIterator.
*
* @param parent pointer
- * @param name to test
+ * @param qName to test
*/
- public DOMAttributeIterator(final NodePointer parent, final QName name) {
+ public DOMAttributeIterator(final NodePointer parent, final QName qName) {
this.parent = parent;
- this.name = name;
+ this.qName = qName;
attributes = new ArrayList<>();
final Node node = (Node) parent.getNode();
if (node.getNodeType() == Node.ELEMENT_NODE) {
- final String lname = name.getName();
+ final String lname = qName.getName();
if (!lname.equals("*")) {
- final Attr attr = getAttribute((Element) node, name);
+ final Attr attr = getAttribute((Element) node, qName);
if (attr != null) {
attributes.add(attr);
}
@@ -74,17 +74,17 @@ public class DOMAttributeIterator implements NodeIterator {
* Gets the named attribute.
*
* @param element to search
- * @param name to match
+ * @param qName to match
* @return Attr found
*/
- private Attr getAttribute(final Element element, final QName name) {
- final String testPrefix = name.getPrefix();
+ private Attr getAttribute(final Element element, final QName qName) {
+ final String testPrefix = qName.getPrefix();
String testNS = null;
if (testPrefix != null) {
testNS = parent.getNamespaceResolver().getNamespaceURI(testPrefix);
}
if (testNS != null) {
- Attr attr = element.getAttributeNodeNS(testNS, name.getName());
+ Attr attr = element.getAttributeNodeNS(testNS, qName.getName());
if (attr != null) {
return attr;
}
@@ -100,7 +100,7 @@ public class DOMAttributeIterator implements NodeIterator {
}
return null;
}
- return element.getAttributeNode(name.getName());
+ return element.getAttributeNode(qName.getName());
}
@Override
@@ -144,9 +144,9 @@ public class DOMAttributeIterator implements NodeIterator {
if (nodePrefix == null && nodeLocalName.equals("xmlns")) {
return false;
}
- final String testLocalName = name.getName();
+ final String testLocalName = qName.getName();
if (testLocalName.equals("*") || testLocalName.equals(nodeLocalName)) {
- final String testPrefix = name.getPrefix();
+ final String testPrefix = qName.getPrefix();
if (testPrefix == null || Objects.equals(testPrefix, nodePrefix)) {
return true;
}
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java
index b3b1e6b..1320241 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java
@@ -330,8 +330,8 @@ public class DOMNodePointer extends NodePointer {
}
@Override
- public NodeIterator attributeIterator(final QName name) {
- return new DOMAttributeIterator(this, name);
+ public NodeIterator attributeIterator(final QName qName) {
+ return new DOMAttributeIterator(this, qName);
}
@Override
@@ -382,12 +382,12 @@ public class DOMNodePointer extends NodePointer {
}
@Override
- public NodePointer createAttribute(final JXPathContext context, final QName name) {
+ public NodePointer createAttribute(final JXPathContext context, final QName qName) {
if (!(node instanceof Element)) {
- return super.createAttribute(context, name);
+ return super.createAttribute(context, qName);
}
final Element element = (Element) node;
- final String prefix = name.getPrefix();
+ final String prefix = qName.getPrefix();
if (prefix != null) {
String ns = null;
final NamespaceResolver nsr = getNamespaceResolver();
@@ -397,37 +397,37 @@ public class DOMNodePointer extends NodePointer {
if (ns == null) {
throw new JXPathException("Unknown namespace prefix: " + prefix);
}
- element.setAttributeNS(ns, name.toString(), "");
- } else if (!element.hasAttribute(name.getName())) {
- element.setAttribute(name.getName(), "");
+ element.setAttributeNS(ns, qName.toString(), "");
+ } else if (!element.hasAttribute(qName.getName())) {
+ element.setAttribute(qName.getName(), "");
}
- final NodeIterator it = attributeIterator(name);
+ final NodeIterator it = attributeIterator(qName);
it.setPosition(1);
return it.getNodePointer();
}
@Override
- public NodePointer createChild(final JXPathContext context, final QName name, int index) {
+ public NodePointer createChild(final JXPathContext context, final QName qName, int index) {
if (index == WHOLE_COLLECTION) {
index = 0;
}
- final boolean success = getAbstractFactory(context).createObject(context, this, node, name.toString(), index);
+ final boolean success = getAbstractFactory(context).createObject(context, this, node, qName.toString(), index);
if (success) {
NodeTest nodeTest;
- final String prefix = name.getPrefix();
+ final String prefix = qName.getPrefix();
final String namespaceURI = prefix == null ? null : context.getNamespaceURI(prefix);
- nodeTest = new NodeNameTest(name, namespaceURI);
+ nodeTest = new NodeNameTest(qName, namespaceURI);
final NodeIterator it = childIterator(nodeTest, false, null);
if (it != null && it.setPosition(index + 1)) {
return it.getNodePointer();
}
}
- throw new JXPathAbstractFactoryException("Factory could not create a child node for path: " + asPath() + "/" + name + "[" + (index + 1) + "]");
+ throw new JXPathAbstractFactoryException("Factory could not create a child node for path: " + asPath() + "/" + qName + "[" + (index + 1) + "]");
}
@Override
- public NodePointer createChild(final JXPathContext context, final QName name, final int index, final Object value) {
- final NodePointer ptr = createChild(context, name, index);
+ public NodePointer createChild(final JXPathContext context, final QName qName, final int index, final Object value) {
+ final NodePointer ptr = createChild(context, qName, index);
ptr.setValue(value);
return ptr;
}
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMPointerFactory.java b/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMPointerFactory.java
index c5623cd..f6b609d 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMPointerFactory.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMPointerFactory.java
@@ -40,12 +40,12 @@ public class DOMPointerFactory implements NodePointerFactory {
}
@Override
- public NodePointer createNodePointer(final NodePointer parent, final QName name, final Object bean) {
+ public NodePointer createNodePointer(final NodePointer parent, final QName qName, final Object bean) {
return bean instanceof Node ? new DOMNodePointer(parent, (Node) bean) : null;
}
@Override
- public NodePointer createNodePointer(final QName name, final Object bean, final Locale locale) {
+ public NodePointer createNodePointer(final QName qName, final Object bean, final Locale locale) {
return bean instanceof Node ? new DOMNodePointer((Node) bean, locale) : null;
}
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/dom/NamespacePointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/dom/NamespacePointer.java
index 9d9e655..4ba40ea 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/dom/NamespacePointer.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/dom/NamespacePointer.java
@@ -29,14 +29,22 @@ import org.apache.commons.jxpath.ri.model.NodePointer;
public class NamespacePointer extends NodePointer {
private static final long serialVersionUID = -7622456151550131709L;
+
+ /**
+ * Namespace prefix.
+ */
private final String prefix;
+
+ /**
+ * Namespace URI String.
+ */
private String namespaceURI;
/**
* Constructs a new NamespacePointer.
- *
+ *
* @param parent parent pointer
- * @param prefix associated ns prefix.
+ * @param prefix namespace prefix.
*/
public NamespacePointer(final NodePointer parent, final String prefix) {
super(parent);
@@ -45,10 +53,10 @@ public class NamespacePointer extends NodePointer {
/**
* Constructs a new NamespacePointer.
- *
+ *
* @param parent parent pointer
- * @param prefix associated ns prefix.
- * @param namespaceURI associated ns URI.
+ * @param prefix namespace prefix.
+ * @param namespaceURI namespace URI.
*/
public NamespacePointer(final NodePointer parent, final String prefix, final String namespaceURI) {
super(parent);
@@ -133,7 +141,7 @@ public class NamespacePointer extends NodePointer {
/**
* Throws UnsupportedOperationException.
- *
+ *
* @param value Object
*/
@Override
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPointer.java
index 7efd9df..2aae130 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPointer.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPointer.java
@@ -43,32 +43,32 @@ public class DynaBeanPointer extends PropertyOwnerPointer {
return o1 == o2 || o1 != null && o1.equals(o2);
}
- private final QName name;
+ private final QName qName;
private final DynaBean dynaBean;
/**
* Constructs a new DynaBeanPointer.
*
* @param parent pointer
- * @param name is the name given to the first node
+ * @param qName is the name given to the first node
* @param dynaBean pointed
*/
- public DynaBeanPointer(final NodePointer parent, final QName name, final DynaBean dynaBean) {
+ public DynaBeanPointer(final NodePointer parent, final QName qName, final DynaBean dynaBean) {
super(parent);
- this.name = name;
+ this.qName = qName;
this.dynaBean = dynaBean;
}
/**
* Constructs a new DynaBeanPointer.
*
- * @param name is the name given to the first node
+ * @param qName is the name given to the first node
* @param dynaBean pointed
* @param locale Locale
*/
- public DynaBeanPointer(final QName name, final DynaBean dynaBean, final Locale locale) {
+ public DynaBeanPointer(final QName qName, final DynaBean dynaBean, final Locale locale) {
super(null, locale);
- this.name = name;
+ this.qName = qName;
this.dynaBean = dynaBean;
}
@@ -86,7 +86,7 @@ public class DynaBeanPointer extends PropertyOwnerPointer {
return false;
}
final DynaBeanPointer other = (DynaBeanPointer) object;
- if (!(equalObjects(parent, other.parent) && equalObjects(name, other.name))) {
+ if (!(equalObjects(parent, other.parent) && equalObjects(qName, other.qName))) {
return false;
}
final int iThis = index == WHOLE_COLLECTION ? 0 : index;
@@ -111,7 +111,7 @@ public class DynaBeanPointer extends PropertyOwnerPointer {
@Override
public QName getName() {
- return name;
+ return qName;
}
@Override
@@ -121,7 +121,7 @@ public class DynaBeanPointer extends PropertyOwnerPointer {
@Override
public int hashCode() {
- return name == null ? 0 : name.hashCode();
+ return qName == null ? 0 : qName.hashCode();
}
@Override
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPointerFactory.java b/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPointerFactory.java
index ad65570..71a4b09 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPointerFactory.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPointerFactory.java
@@ -40,13 +40,13 @@ public class DynaBeanPointerFactory implements NodePointerFactory {
}
@Override
- public NodePointer createNodePointer(final NodePointer parent, final QName name, final Object bean) {
- return bean instanceof DynaBean ? new DynaBeanPointer(parent, name, (DynaBean) bean) : null;
+ public NodePointer createNodePointer(final NodePointer parent, final QName qName, final Object bean) {
+ return bean instanceof DynaBean ? new DynaBeanPointer(parent, qName, (DynaBean) bean) : null;
}
@Override
- public NodePointer createNodePointer(final QName name, final Object bean, final Locale locale) {
- return bean instanceof DynaBean ? new DynaBeanPointer(name, (DynaBean) bean, locale) : null;
+ public NodePointer createNodePointer(final QName qName, final Object bean, final Locale locale) {
+ return bean instanceof DynaBean ? new DynaBeanPointer(qName, (DynaBean) bean, locale) : null;
}
@Override
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/StrictLazyDynaBeanPointerFactory.java b/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/StrictLazyDynaBeanPointerFactory.java
index 8b88758..780b57d 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/StrictLazyDynaBeanPointerFactory.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/StrictLazyDynaBeanPointerFactory.java
@@ -45,23 +45,23 @@ public class StrictLazyDynaBeanPointerFactory implements NodePointerFactory {
* Constructs a new StrictLazyDynaBeanPointer instance.
*
* @param parent pointer
- * @param name is the name given to the first node
+ * @param qName is the name given to the first node
* @param lazyDynaBean pointed
*/
- public StrictLazyDynaBeanPointer(final NodePointer parent, final QName name, final LazyDynaBean lazyDynaBean) {
- super(parent, name, lazyDynaBean);
+ public StrictLazyDynaBeanPointer(final NodePointer parent, final QName qName, final LazyDynaBean lazyDynaBean) {
+ super(parent, qName, lazyDynaBean);
this.lazyDynaBean = lazyDynaBean;
}
/**
* Constructs a new StrictLazyDynaBeanPointer instance.
*
- * @param name is the name given to the first node
+ * @param qName is the name given to the first node
* @param lazyDynaBean pointed
* @param locale Locale
*/
- public StrictLazyDynaBeanPointer(final QName name, final LazyDynaBean lazyDynaBean, final Locale locale) {
- super(name, lazyDynaBean, locale);
+ public StrictLazyDynaBeanPointer(final QName qName, final LazyDynaBean lazyDynaBean, final Locale locale) {
+ super(qName, lazyDynaBean, locale);
this.lazyDynaBean = lazyDynaBean;
}
@@ -93,16 +93,16 @@ public class StrictLazyDynaBeanPointerFactory implements NodePointerFactory {
* {@inheritDoc}
*/
@Override
- public NodePointer createNodePointer(final NodePointer parent, final QName name, final Object object) {
- return object instanceof LazyDynaBean ? new StrictLazyDynaBeanPointer(parent, name, (LazyDynaBean) object) : null;
+ public NodePointer createNodePointer(final NodePointer parent, final QName qName, final Object object) {
+ return object instanceof LazyDynaBean ? new StrictLazyDynaBeanPointer(parent, qName, (LazyDynaBean) object) : null;
}
/**
* {@inheritDoc}
*/
@Override
- public NodePointer createNodePointer(final QName name, final Object object, final Locale locale) {
- return object instanceof LazyDynaBean ? new StrictLazyDynaBeanPointer(name, (LazyDynaBean) object, locale) : null;
+ public NodePointer createNodePointer(final QName qName, final Object object, final Locale locale) {
+ return object instanceof LazyDynaBean ? new StrictLazyDynaBeanPointer(qName, (LazyDynaBean) object, locale) : null;
}
/**
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicAttributeIterator.java b/src/main/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicAttributeIterator.java
index b500322..01f704c 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicAttributeIterator.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicAttributeIterator.java
@@ -31,10 +31,10 @@ public class DynamicAttributeIterator extends BeanAttributeIterator {
* Constructs a new DynamicAttributeIterator.
*
* @param parent pointer
- * @param name to match properties
+ * @param qName to match properties
*/
- public DynamicAttributeIterator(final PropertyOwnerPointer parent, final QName name) {
- super(parent, name);
+ public DynamicAttributeIterator(final PropertyOwnerPointer parent, final QName qName) {
+ super(parent, qName);
}
@Override
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPointer.java
index c35ca25..1eda03d 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPointer.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPointer.java
@@ -35,7 +35,7 @@ import org.apache.commons.jxpath.ri.model.beans.PropertyPointer;
public class DynamicPointer extends PropertyOwnerPointer {
private static final long serialVersionUID = -1842347025295904256L;
- private final QName name;
+ private final QName qName;
private final Object bean;
private final DynamicPropertyHandler handler;
@@ -43,13 +43,13 @@ public class DynamicPointer extends PropertyOwnerPointer {
* Constructs a new DynamicPointer.
*
* @param parent parent pointer
- * @param name property name
+ * @param qName property name
* @param bean owning bean
* @param handler DynamicPropertyHandler
*/
- public DynamicPointer(final NodePointer parent, final QName name, final Object bean, final DynamicPropertyHandler handler) {
+ public DynamicPointer(final NodePointer parent, final QName qName, final Object bean, final DynamicPropertyHandler handler) {
super(parent);
- this.name = name;
+ this.qName = qName;
this.bean = bean;
this.handler = handler;
}
@@ -57,14 +57,14 @@ public class DynamicPointer extends PropertyOwnerPointer {
/**
* Constructs a new DynamicPointer.
*
- * @param name property name
+ * @param qName property name
* @param bean owning bean
* @param handler DynamicPropertyHandler
* @param locale Locale
*/
- public DynamicPointer(final QName name, final Object bean, final DynamicPropertyHandler handler, final Locale locale) {
+ public DynamicPointer(final QName qName, final Object bean, final DynamicPropertyHandler handler, final Locale locale) {
super(null, locale);
- this.name = name;
+ this.qName = qName;
this.bean = bean;
this.handler = handler;
}
@@ -75,8 +75,8 @@ public class DynamicPointer extends PropertyOwnerPointer {
}
@Override
- public NodeIterator attributeIterator(final QName name) {
- return new DynamicAttributeIterator(this, name);
+ public NodeIterator attributeIterator(final QName qName) {
+ return new DynamicAttributeIterator(this, qName);
}
@Override
@@ -96,7 +96,7 @@ public class DynamicPointer extends PropertyOwnerPointer {
if (bean != other.bean) {
return false;
}
- return name == other.name || name != null && name.equals(other.name);
+ return qName == other.qName || qName != null && qName.equals(other.qName);
}
/**
@@ -121,7 +121,7 @@ public class DynamicPointer extends PropertyOwnerPointer {
@Override
public QName getName() {
- return name;
+ return qName;
}
@Override
@@ -131,7 +131,7 @@ public class DynamicPointer extends PropertyOwnerPointer {
@Override
public int hashCode() {
- return System.identityHashCode(bean) + (name == null ? 0 : name.hashCode());
+ return System.identityHashCode(bean) + (qName == null ? 0 : qName.hashCode());
}
@Override
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPointerFactory.java b/src/main/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPointerFactory.java
index b2b7605..4c0b6a3 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPointerFactory.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPointerFactory.java
@@ -46,24 +46,24 @@ public class DynamicPointerFactory implements NodePointerFactory {
}
@Override
- public NodePointer createNodePointer(final NodePointer parent, final QName name, final Object bean) {
+ public NodePointer createNodePointer(final NodePointer parent, final QName qName, final Object bean) {
if (bean == null) {
- return new NullPointer(parent, name);
+ return new NullPointer(parent, qName);
}
final JXPathBeanInfo bi = JXPathIntrospector.getBeanInfo(bean.getClass());
if (bi.isDynamic()) {
final DynamicPropertyHandler handler = ValueUtils.getDynamicPropertyHandler(bi.getDynamicPropertyHandlerClass());
- return new DynamicPointer(parent, name, bean, handler);
+ return new DynamicPointer(parent, qName, bean, handler);
}
return null;
}
@Override
- public NodePointer createNodePointer(final QName name, final Object bean, final Locale locale) {
+ public NodePointer createNodePointer(final QName qName, final Object bean, final Locale locale) {
final JXPathBeanInfo bi = JXPathIntrospector.getBeanInfo(bean.getClass());
if (bi.isDynamic()) {
final DynamicPropertyHandler handler = ValueUtils.getDynamicPropertyHandler(bi.getDynamicPropertyHandlerClass());
- return new DynamicPointer(name, bean, handler, locale);
+ return new DynamicPointer(qName, bean, handler, locale);
}
return null;
}
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributeIterator.java b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributeIterator.java
index e92963c..7cb4b0c 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributeIterator.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributeIterator.java
@@ -41,13 +41,13 @@ public class JDOMAttributeIterator implements NodeIterator {
* Constructs a new JDOMAttributeIterator.
*
* @param parent pointer
- * @param name test
+ * @param qName test
*/
- public JDOMAttributeIterator(final NodePointer parent, final QName name) {
+ public JDOMAttributeIterator(final NodePointer parent, final QName qName) {
this.parent = parent;
if (parent.getNode() instanceof Element) {
final Element element = (Element) parent.getNode();
- final String prefix = name.getPrefix();
+ final String prefix = qName.getPrefix();
Namespace ns = null;
if (prefix != null) {
if (prefix.equals("xml")) {
@@ -66,7 +66,7 @@ public class JDOMAttributeIterator implements NodeIterator {
} else {
ns = Namespace.NO_NAMESPACE;
}
- final String lname = name.getName();
+ final String lname = qName.getName();
if (!lname.equals("*")) {
attributes = new ArrayList<>();
final Attribute attr = element.getAttribute(lname, ns);
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java
index f2d895c..6c94f53 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java
@@ -346,8 +346,8 @@ public class JDOMNodePointer extends NodePointer {
}
@Override
- public NodeIterator attributeIterator(final QName name) {
- return new JDOMAttributeIterator(this, name);
+ public NodeIterator attributeIterator(final QName qName) {
+ return new JDOMAttributeIterator(this, qName);
}
@Override
@@ -400,55 +400,55 @@ public class JDOMNodePointer extends NodePointer {
}
@Override
- public NodePointer createAttribute(final JXPathContext context, final QName name) {
+ public NodePointer createAttribute(final JXPathContext context, final QName qName) {
if (!(node instanceof Element)) {
- return super.createAttribute(context, name);
+ return super.createAttribute(context, qName);
}
final Element element = (Element) node;
- final String prefix = name.getPrefix();
+ final String prefix = qName.getPrefix();
if (prefix != null) {
final String namespaceUri = getNamespaceResolver().getNamespaceURI(prefix);
if (namespaceUri == null) {
throw new JXPathException("Unknown namespace prefix: " + prefix);
}
final Namespace ns = Namespace.getNamespace(prefix, namespaceUri);
- final Attribute attr = element.getAttribute(name.getName(), ns);
+ final Attribute attr = element.getAttribute(qName.getName(), ns);
if (attr == null) {
- element.setAttribute(name.getName(), "", ns);
+ element.setAttribute(qName.getName(), "", ns);
}
} else {
- final Attribute attr = element.getAttribute(name.getName());
+ final Attribute attr = element.getAttribute(qName.getName());
if (attr == null) {
- element.setAttribute(name.getName(), "");
+ element.setAttribute(qName.getName(), "");
}
}
- final NodeIterator it = attributeIterator(name);
+ final NodeIterator it = attributeIterator(qName);
it.setPosition(1);
return it.getNodePointer();
}
@Override
- public NodePointer createChild(final JXPathContext context, final QName name, int index) {
+ public NodePointer createChild(final JXPathContext context, final QName qName, int index) {
if (index == WHOLE_COLLECTION) {
index = 0;
}
- final boolean success = getAbstractFactory(context).createObject(context, this, node, name.toString(), index);
+ final boolean success = getAbstractFactory(context).createObject(context, this, node, qName.toString(), index);
if (success) {
NodeTest nodeTest;
- final String prefix = name.getPrefix();
+ final String prefix = qName.getPrefix();
final String namespaceURI = prefix == null ? null : context.getNamespaceURI(prefix);
- nodeTest = new NodeNameTest(name, namespaceURI);
+ nodeTest = new NodeNameTest(qName, namespaceURI);
final NodeIterator it = childIterator(nodeTest, false, null);
if (it != null && it.setPosition(index + 1)) {
return it.getNodePointer();
}
}
- throw new JXPathAbstractFactoryException("Factory could not create a child node for path: " + asPath() + "/" + name + "[" + (index + 1) + "]");
+ throw new JXPathAbstractFactoryException("Factory could not create a child node for path: " + asPath() + "/" + qName + "[" + (index + 1) + "]");
}
@Override
- public NodePointer createChild(final JXPathContext context, final QName name, final int index, final Object value) {
- final NodePointer ptr = createChild(context, name, index);
+ public NodePointer createChild(final JXPathContext context, final QName qName, final int index, final Object value) {
+ final NodePointer ptr = createChild(context, qName, index);
ptr.setValue(value);
return ptr;
}
diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMPointerFactory.java b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMPointerFactory.java
index cff14a7..b3d44f1 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMPointerFactory.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMPointerFactory.java
@@ -41,7 +41,7 @@ public class JDOMPointerFactory implements NodePointerFactory {
}
@Override
- public NodePointer createNodePointer(final NodePointer parent, final QName name, final Object bean) {
+ public NodePointer createNodePointer(final NodePointer parent, final QName qName, final Object bean) {
if (bean instanceof Document) {
return new JDOMNodePointer(parent, bean);
}
@@ -52,7 +52,7 @@ public class JDOMPointerFactory implements NodePointerFactory {
}
@Override
- public NodePointer createNodePointer(final QName name, final Object bean, final Locale locale) {
+ public NodePointer createNodePointer(final QName qName, final Object bean, final Locale locale) {
if (bean instanceof Document) {
return new JDOMNodePointer(bean, locale);
}