Author: thorsten
Date: Mon Sep 29 05:51:11 2008
New Revision: 700114
URL: http://svn.apache.org/viewvc?rev=700114&view=rev
Log:
WSCOMMONS-389
Renaming class and updating fixme note
Added:
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java
- copied, changed from r700108,
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathPatched.java
Removed:
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathPatched.java
Modified:
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/XMLStructurerAxiom.java
Modified:
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/XMLStructurerAxiom.java
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/XMLStructurerAxiom.java?rev=700114&r1=700113&r2=700114&view=diff
==============================================================================
---
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/XMLStructurerAxiom.java
(original)
+++
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/XMLStructurerAxiom.java
Mon Sep 29 05:51:11 2008
@@ -28,7 +28,7 @@
import org.apache.forrest.dispatcher.config.DispatcherBean;
import org.apache.forrest.dispatcher.exception.DispatcherException;
import org.apache.forrest.dispatcher.factories.ContractFactory;
-import org.apache.forrest.dispatcher.impl.helper.AXIOMXPathPatched;
+import org.apache.forrest.dispatcher.impl.helper.AXIOMXPathCreate;
import org.apache.forrest.dispatcher.impl.helper.Captions;
import org.apache.forrest.dispatcher.impl.helper.StAX;
import org.apache.forrest.dispatcher.impl.helper.StreamHelper;
@@ -103,7 +103,7 @@
path="";
}
currentPath += path;
- AXIOMXPathPatched xpath = new AXIOMXPathPatched(currentPath);
+ AXIOMXPathCreate xpath = new AXIOMXPathCreate(currentPath);
Object pathNode = (OMElement) xpath.selectSingleNode(root, true);
processStructure(structure, (OMElement) pathNode);
}
@@ -289,7 +289,7 @@
} else {
xpath = PATH_PREFIX + xpath;
// we need to feed the xpathSelector with the ns we may have
- AXIOMXPathPatched xpathSelector = new AXIOMXPathPatched(xpath);
+ AXIOMXPathCreate xpathSelector = new AXIOMXPathCreate(xpath);
for (OMNamespace space : spaces) {
xpathSelector
Copied:
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java
(from r700108,
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathPatched.java)
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java?p2=forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java&p1=forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathPatched.java&r1=700108&r2=700114&rev=700114&view=diff
==============================================================================
---
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathPatched.java
(original)
+++
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java
Mon Sep 29 05:51:11 2008
@@ -32,25 +32,19 @@
/**
* Issue: WSCOMMONS-389
*
- * As soon the above issue is fixed we need to drop this implementation since
it
- * will be in the AXIOMXPath.
- *
- * The process should be
- * <ol>
- * <li>stripping this class that it is only extending super and mark this class
- * as deprecated
- * <li>remove it the next release.
+ * As soon the above issue is fixed we need to drop this implementation since
+ * this class will be go into the axiom code base.
*
* @version 1.0
*
*/
-public class AXIOMXPathPatched extends AXIOMXPath {
+public class AXIOMXPathCreate extends AXIOMXPath {
private static final long serialVersionUID = -4670206430863692541L;
private String xpathExpr;
private OMFactory factory;
- public AXIOMXPathPatched(String xpathExpr) throws JaxenException {
+ public AXIOMXPathCreate(String xpathExpr) throws JaxenException {
super(xpathExpr);
this.xpathExpr = xpathExpr;
this.factory = OMAbstractFactory.getOMFactory();
@@ -181,9 +175,9 @@
*/
private AXIOMXPath getNsXPath(String path) throws JaxenException {
AXIOMXPath xpath = new AXIOMXPath(path);
- Iterator iterator = this.getNamespaces().keySet().iterator();
+ Iterator<String> iterator = this.getNamespaces().keySet().iterator();
while (iterator.hasNext()) {
- String key = (String) iterator.next();
+ String key = iterator.next();
String value = (String) getNamespaces().get(key);
xpath.addNamespace(key, value);
}
