You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2016/01/30 19:42:23 UTC
svn commit: r1727743 - in /webservices/axiom/trunk:
aspects/core-aspects/src/main/java/org/apache/axiom/core/
aspects/dom-aspects/src/main/java/org/apache/axiom/dom/
aspects/dom-aspects/src/main/resources/org/apache/axiom/dom/
aspects/dom-aspects/src/t...
Author: veithen
Date: Sat Jan 30 18:42:23 2016
New Revision: 1727743
URL: http://svn.apache.org/viewvc?rev=1727743&view=rev
Log:
Merge ExceptionTranslator into Semantics.
Added:
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMExceptionUtil.java
- copied, changed from r1727527, webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMExceptionTranslator.java
webservices/axiom/trunk/aspects/dom-aspects/src/main/resources/org/apache/axiom/dom/DOMExceptionUtil.properties
- copied unchanged from r1727527, webservices/axiom/trunk/aspects/dom-aspects/src/main/resources/org/apache/axiom/dom/DOMExceptionTranslator.properties
Removed:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/ExceptionTranslator.java
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMExceptionTranslator.java
webservices/axiom/trunk/aspects/dom-aspects/src/main/resources/org/apache/axiom/dom/DOMExceptionTranslator.properties
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/AbstractNodeIterator.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNodeSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/ElementsIterator.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Semantics.java
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/AttributesNamedNodeMap.java
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMCharacterDataSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMEntityReferenceSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMLeafNodeSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNSAwareNamedNodeSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNSUnawareNamedNodeSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNamespaceDeclarationSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMParentNodeSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMSemantics.java
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/ElementsByTagName.java
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/ElementsByTagNameNS.java
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/NSUtil.java
webservices/axiom/trunk/aspects/dom-aspects/src/test/java/org/apache/axiom/dom/DOMExceptionTranslatorTest.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomExceptionTranslator.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomSemantics.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/AbstractNodeIterator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/AbstractNodeIterator.java?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/AbstractNodeIterator.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/AbstractNodeIterator.java Sat Jan 30 18:42:23 2016
@@ -25,7 +25,6 @@ public abstract class AbstractNodeIterat
private final CoreParentNode startNode;
private final Axis axis;
private final Class<T> type;
- private final ExceptionTranslator exceptionTranslator;
private final Semantics semantics;
private CoreNode currentNode;
@@ -38,11 +37,10 @@ public abstract class AbstractNodeIterat
private boolean hasNext;
private int depth;
- public AbstractNodeIterator(CoreParentNode startNode, Axis axis, Class<T> type, ExceptionTranslator exceptionTranslator, Semantics semantics) {
+ public AbstractNodeIterator(CoreParentNode startNode, Axis axis, Class<T> type, Semantics semantics) {
this.startNode = startNode;
this.axis = axis;
this.type = type;
- this.exceptionTranslator = exceptionTranslator;
this.semantics = semantics;
}
@@ -102,7 +100,7 @@ public abstract class AbstractNodeIterat
}
} while (node != null && !matches(node));
} catch (CoreModelException ex) {
- throw exceptionTranslator.toUncheckedException(ex);
+ throw semantics.toUncheckedException(ex);
}
nextNode = node;
hasNext = true;
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java Sat Jan 30 18:42:23 2016
@@ -35,5 +35,5 @@ public interface CoreParentNode extends
void coreSetState(int state);
void build();
- <T extends CoreElement> NodeIterator<T> coreGetElements(Axis axis, Class<T> type, ElementMatcher<? super T> matcher, String namespaceURI, String name, ExceptionTranslator exceptionTranslator, Semantics semantics);
+ <T extends CoreElement> NodeIterator<T> coreGetElements(Axis axis, Class<T> type, ElementMatcher<? super T> matcher, String namespaceURI, String name, Semantics semantics);
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNodeSupport.aj?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNodeSupport.aj Sat Jan 30 18:42:23 2016
@@ -295,8 +295,8 @@ public aspect CoreParentNodeSupport {
}
}
- public final <T> NodeIterator<T> CoreParentNode.coreGetNodes(Axis axis, Class<T> type, ExceptionTranslator exceptionTranslator, Semantics semantics) {
- return new AbstractNodeIterator<T>(this, axis, type, exceptionTranslator, semantics) {
+ public final <T> NodeIterator<T> CoreParentNode.coreGetNodes(Axis axis, Class<T> type, Semantics semantics) {
+ return new AbstractNodeIterator<T>(this, axis, type, semantics) {
@Override
protected boolean matches(CoreNode node) throws CoreModelException {
return true;
@@ -304,8 +304,8 @@ public aspect CoreParentNodeSupport {
};
}
- public final <T extends CoreElement> NodeIterator<T> CoreParentNode.coreGetElements(Axis axis, Class<T> type, ElementMatcher<? super T> matcher, String namespaceURI, String name, ExceptionTranslator exceptionTranslator, Semantics semantics) {
- return new ElementsIterator<T>(this, axis, type, matcher, namespaceURI, name, exceptionTranslator, semantics);
+ public final <T extends CoreElement> NodeIterator<T> CoreParentNode.coreGetElements(Axis axis, Class<T> type, ElementMatcher<? super T> matcher, String namespaceURI, String name, Semantics semantics) {
+ return new ElementsIterator<T>(this, axis, type, matcher, namespaceURI, name, semantics);
}
public final <T> void CoreParentNode.cloneChildrenIfNecessary(ClonePolicy<T> policy, T options, CoreNode clone) {
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/ElementsIterator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/ElementsIterator.java?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/ElementsIterator.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/ElementsIterator.java Sat Jan 30 18:42:23 2016
@@ -24,8 +24,8 @@ final class ElementsIterator<T extends C
private final String namespaceURI;
private final String name;
- public ElementsIterator(CoreParentNode startNode, Axis axis, Class<T> type, ElementMatcher<? super T> matcher, String namespaceURI, String name, ExceptionTranslator exceptionTranslator, Semantics semantics) {
- super(startNode, axis, type, exceptionTranslator, semantics);
+ public ElementsIterator(CoreParentNode startNode, Axis axis, Class<T> type, ElementMatcher<? super T> matcher, String namespaceURI, String name, Semantics semantics) {
+ super(startNode, axis, type, semantics);
this.type = type;
this.matcher = matcher;
this.namespaceURI = namespaceURI;
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Semantics.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Semantics.java?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Semantics.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Semantics.java Sat Jan 30 18:42:23 2016
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.core;
+import java.util.Iterator;
+
/**
* Defines the semantics of a particular API.
*/
@@ -44,4 +46,15 @@ public interface Semantics {
* considered a leaf node type
*/
boolean isParentNode(NodeType nodeType);
+
+ /**
+ * Translate the given exception to an unchecked exception. This is used by {@link NodeIterator}
+ * to translate exceptions that are triggered in {@link Iterator#hasNext()},
+ * {@link Iterator#next()} and {@link Iterator#remove()}.
+ *
+ * @param ex
+ * the original (checked) exception
+ * @return the corresponding unchecked exception
+ */
+ RuntimeException toUncheckedException(CoreModelException ex);
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/AttributesNamedNodeMap.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/AttributesNamedNodeMap.java?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/AttributesNamedNodeMap.java (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/AttributesNamedNodeMap.java Sat Jan 30 18:42:23 2016
@@ -63,7 +63,7 @@ final class AttributesNamedNodeMap imple
if (arg instanceof CoreTypedAttribute) {
return element.setAttributeNode((Attr)arg);
} else {
- throw DOMExceptionTranslator.newDOMException(DOMException.HIERARCHY_REQUEST_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.HIERARCHY_REQUEST_ERR);
}
}
@@ -71,7 +71,7 @@ final class AttributesNamedNodeMap imple
if (arg instanceof CoreTypedAttribute) {
return element.setAttributeNodeNS((Attr)arg);
} else {
- throw DOMExceptionTranslator.newDOMException(DOMException.HIERARCHY_REQUEST_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.HIERARCHY_REQUEST_ERR);
}
}
@@ -82,7 +82,7 @@ final class AttributesNamedNodeMap imple
element.removeAttributeNode(attr);
return attr;
} else {
- throw DOMExceptionTranslator.newDOMException(DOMException.NOT_FOUND_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.NOT_FOUND_ERR);
}
}
@@ -93,7 +93,7 @@ final class AttributesNamedNodeMap imple
element.removeAttributeNode(attr);
return attr;
} else {
- throw DOMExceptionTranslator.newDOMException(DOMException.NOT_FOUND_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.NOT_FOUND_ERR);
}
}
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMCharacterDataSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMCharacterDataSupport.aj?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMCharacterDataSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMCharacterDataSupport.aj Sat Jan 30 18:42:23 2016
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.dom;
-import static org.apache.axiom.dom.DOMExceptionTranslator.newDOMException;
+import static org.apache.axiom.dom.DOMExceptionUtil.newDOMException;
import org.w3c.dom.DOMException;
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj Sat Jan 30 18:42:23 2016
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.dom;
-import static org.apache.axiom.dom.DOMExceptionTranslator.newDOMException;
+import static org.apache.axiom.dom.DOMExceptionUtil.newDOMException;
import org.apache.axiom.core.CoreElement;
import org.apache.axiom.core.ElementAction;
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj Sat Jan 30 18:42:23 2016
@@ -251,11 +251,11 @@ public aspect DOMDocumentSupport {
// TODO: need unit test to check that this method works as expected on an OMSourcedElement
public final Node DOMDocument.renameNode(Node node, String namespaceURI, String qualifiedName) {
if (!(node instanceof DOMNode && ((DOMNode)node).coreHasSameOwnerDocument(this))) {
- throw DOMExceptionTranslator.newDOMException(DOMException.WRONG_DOCUMENT_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.WRONG_DOCUMENT_ERR);
}
// TODO: what about an attempt to rename a namespace unaware node?
if (!(node instanceof DOMNSAwareNamedNode)) {
- throw DOMExceptionTranslator.newDOMException(DOMException.NOT_SUPPORTED_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.NOT_SUPPORTED_ERR);
}
int i = NSUtil.validateQualifiedName(qualifiedName);
String prefix;
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj Sat Jan 30 18:42:23 2016
@@ -136,7 +136,7 @@ public aspect DOMElementSupport {
public final Attr DOMElement.setAttributeNodeNS(Attr _newAttr) throws DOMException {
if (!(_newAttr instanceof DOMAttribute)) {
- throw DOMExceptionTranslator.newDOMException(DOMException.WRONG_DOCUMENT_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.WRONG_DOCUMENT_ERR);
}
DOMAttribute newAttr = (DOMAttribute)_newAttr;
CoreElement owner = newAttr.coreGetOwnerElement();
@@ -145,10 +145,10 @@ public aspect DOMElementSupport {
// and replaces itself.
return newAttr;
} else if (owner != null) {
- throw DOMExceptionTranslator.newDOMException(DOMException.INUSE_ATTRIBUTE_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.INUSE_ATTRIBUTE_ERR);
} else {
if (!coreHasSameOwnerDocument(newAttr)) {
- throw DOMExceptionTranslator.newDOMException(DOMException.WRONG_DOCUMENT_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.WRONG_DOCUMENT_ERR);
}
AttributeMatcher matcher;
if (newAttr instanceof CoreNSAwareAttribute) {
@@ -167,13 +167,13 @@ public aspect DOMElementSupport {
if (oldAttr instanceof DOMAttribute) {
DOMAttribute attr = (DOMAttribute)oldAttr;
if (attr.coreGetOwnerElement() != this) {
- throw DOMExceptionTranslator.newDOMException(DOMException.NOT_FOUND_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.NOT_FOUND_ERR);
} else {
attr.coreRemove(DOMSemantics.INSTANCE);
}
return attr;
} else {
- throw DOMExceptionTranslator.newDOMException(DOMException.NOT_FOUND_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.NOT_FOUND_ERR);
}
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMEntityReferenceSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMEntityReferenceSupport.aj?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMEntityReferenceSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMEntityReferenceSupport.aj Sat Jan 30 18:42:23 2016
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.dom;
-import static org.apache.axiom.dom.DOMExceptionTranslator.newDOMException;
+import static org.apache.axiom.dom.DOMExceptionUtil.newDOMException;
import org.apache.axiom.core.CoreElement;
import org.w3c.dom.DOMException;
Copied: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMExceptionUtil.java (from r1727527, webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMExceptionTranslator.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMExceptionUtil.java?p2=webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMExceptionUtil.java&p1=webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMExceptionTranslator.java&r1=1727527&r2=1727743&rev=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMExceptionTranslator.java (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMExceptionUtil.java Sat Jan 30 18:42:23 2016
@@ -22,15 +22,11 @@ import java.util.MissingResourceExceptio
import java.util.PropertyResourceBundle;
import java.util.ResourceBundle;
-import org.apache.axiom.core.CoreModelException;
-import org.apache.axiom.core.ExceptionTranslator;
import org.w3c.dom.DOMException;
-public final class DOMExceptionTranslator implements ExceptionTranslator {
- public static final DOMExceptionTranslator INSTANCE = new DOMExceptionTranslator();
-
+public final class DOMExceptionUtil {
private static final ResourceBundle resourceBundle =
- PropertyResourceBundle.getBundle(DOMExceptionTranslator.class.getName());
+ PropertyResourceBundle.getBundle(DOMExceptionUtil.class.getName());
private static final String[] codeStrings = {
// Note: order is determined by the constants defined in DOMException
@@ -53,7 +49,7 @@ public final class DOMExceptionTranslato
"TYPE_MISMATCH_ERR",
};
- private DOMExceptionTranslator() {}
+ private DOMExceptionUtil() {}
public static DOMException newDOMException(short code) {
String key = codeStrings[code-1];
@@ -69,12 +65,4 @@ public final class DOMExceptionTranslato
return new DOMException(code, key + ": " + message);
}
}
-
- public static RuntimeException translate(CoreModelException ex) {
- throw new IllegalArgumentException("Don't know how to translate " + ex.getClass().getName());
- }
-
- public RuntimeException toUncheckedException(CoreModelException ex) {
- return translate(ex);
- }
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMLeafNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMLeafNodeSupport.aj?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMLeafNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMLeafNodeSupport.aj Sat Jan 30 18:42:23 2016
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.dom;
-import static org.apache.axiom.dom.DOMExceptionTranslator.newDOMException;
+import static org.apache.axiom.dom.DOMExceptionUtil.newDOMException;
import org.apache.axiom.core.CoreElement;
import org.w3c.dom.DOMException;
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNSAwareNamedNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNSAwareNamedNodeSupport.aj?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNSAwareNamedNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNSAwareNamedNodeSupport.aj Sat Jan 30 18:42:23 2016
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.dom;
-import static org.apache.axiom.dom.DOMExceptionTranslator.newDOMException;
+import static org.apache.axiom.dom.DOMExceptionUtil.newDOMException;
import org.w3c.dom.DOMException;
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNSUnawareNamedNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNSUnawareNamedNodeSupport.aj?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNSUnawareNamedNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNSUnawareNamedNodeSupport.aj Sat Jan 30 18:42:23 2016
@@ -30,7 +30,7 @@ public aspect DOMNSUnawareNamedNodeSuppo
}
public final void DOMNSUnawareNamedNode.setPrefix(String prefix) throws DOMException {
- throw DOMExceptionTranslator.newDOMException(DOMException.NAMESPACE_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.NAMESPACE_ERR);
}
public final String DOMNSUnawareNamedNode.getLocalName() {
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNamespaceDeclarationSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNamespaceDeclarationSupport.aj?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNamespaceDeclarationSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNamespaceDeclarationSupport.aj Sat Jan 30 18:42:23 2016
@@ -34,7 +34,7 @@ public aspect DOMNamespaceDeclarationSup
public final void DOMNamespaceDeclaration.setPrefix(String prefix) throws DOMException {
// Other DOM implementations allow changing the prefix, but this means that a namespace
// declaration is transformed into a normal attribute. We don't support this.
- throw DOMExceptionTranslator.newDOMException(DOMException.NAMESPACE_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.NAMESPACE_ERR);
}
public final String DOMNamespaceDeclaration.getLocalName() {
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMParentNodeSupport.aj?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMParentNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMParentNodeSupport.aj Sat Jan 30 18:42:23 2016
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.dom;
-import static org.apache.axiom.dom.DOMExceptionTranslator.newDOMException;
+import static org.apache.axiom.dom.DOMExceptionUtil.newDOMException;
import org.apache.axiom.core.CoreChildNode;
import org.w3c.dom.DOMException;
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMSemantics.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMSemantics.java?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMSemantics.java (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMSemantics.java Sat Jan 30 18:42:23 2016
@@ -25,6 +25,7 @@ import org.apache.axiom.core.AttributeMa
import org.apache.axiom.core.ClonePolicy;
import org.apache.axiom.core.CoreAttribute;
import org.apache.axiom.core.CoreElement;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.CoreNSUnawareAttribute;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.DetachPolicy;
@@ -147,4 +148,8 @@ public final class DOMSemantics implemen
public void postProcess(Void options, CoreNode clone) {
}
};
+
+ public RuntimeException toUncheckedException(CoreModelException ex) {
+ throw new IllegalArgumentException("Don't know how to translate " + ex.getClass().getName());
+ }
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/ElementsByTagName.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/ElementsByTagName.java?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/ElementsByTagName.java (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/ElementsByTagName.java Sat Jan 30 18:42:23 2016
@@ -36,9 +36,9 @@ public class ElementsByTagName extends N
@Override
protected Iterator<? extends Node> createIterator() {
if (tagname.equals("*")) {
- return node.coreGetElements(Axis.DESCENDANTS, DOMElement.class, ElementMatcher.ANY, null, null, DOMExceptionTranslator.INSTANCE, DOMSemantics.INSTANCE);
+ return node.coreGetElements(Axis.DESCENDANTS, DOMElement.class, ElementMatcher.ANY, null, null, DOMSemantics.INSTANCE);
} else {
- return node.coreGetElements(Axis.DESCENDANTS, DOMElement.class, ElementMatcher.BY_NAME, null, tagname, DOMExceptionTranslator.INSTANCE, DOMSemantics.INSTANCE);
+ return node.coreGetElements(Axis.DESCENDANTS, DOMElement.class, ElementMatcher.BY_NAME, null, tagname, DOMSemantics.INSTANCE);
}
}
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/ElementsByTagNameNS.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/ElementsByTagNameNS.java?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/ElementsByTagNameNS.java (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/ElementsByTagNameNS.java Sat Jan 30 18:42:23 2016
@@ -41,13 +41,13 @@ public class ElementsByTagNameNS extends
boolean localNameWildcard = localName.equals("*");
if (nsWildcard && localNameWildcard) {
// TODO: there seems to be no unit test checking whether the iterator should return DOM1 elements!
- return node.coreGetElements(Axis.DESCENDANTS, DOMElement.class, ElementMatcher.ANY, null, null, DOMExceptionTranslator.INSTANCE, DOMSemantics.INSTANCE);
+ return node.coreGetElements(Axis.DESCENDANTS, DOMElement.class, ElementMatcher.ANY, null, null, DOMSemantics.INSTANCE);
} else if (nsWildcard) {
- return node.coreGetElements(Axis.DESCENDANTS, DOMNSAwareElement.class, ElementMatcher.BY_LOCAL_NAME, null, localName, DOMExceptionTranslator.INSTANCE, DOMSemantics.INSTANCE);
+ return node.coreGetElements(Axis.DESCENDANTS, DOMNSAwareElement.class, ElementMatcher.BY_LOCAL_NAME, null, localName, DOMSemantics.INSTANCE);
} else if (localNameWildcard) {
- return node.coreGetElements(Axis.DESCENDANTS, DOMNSAwareElement.class, ElementMatcher.BY_NAMESPACE_URI, namespaceURI, null, DOMExceptionTranslator.INSTANCE, DOMSemantics.INSTANCE);
+ return node.coreGetElements(Axis.DESCENDANTS, DOMNSAwareElement.class, ElementMatcher.BY_NAMESPACE_URI, namespaceURI, null, DOMSemantics.INSTANCE);
} else {
- return node.coreGetElements(Axis.DESCENDANTS, DOMNSAwareElement.class, ElementMatcher.BY_QNAME, namespaceURI, localName, DOMExceptionTranslator.INSTANCE, DOMSemantics.INSTANCE);
+ return node.coreGetElements(Axis.DESCENDANTS, DOMNSAwareElement.class, ElementMatcher.BY_QNAME, namespaceURI, localName, DOMSemantics.INSTANCE);
}
}
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/NSUtil.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/NSUtil.java?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/NSUtil.java (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/NSUtil.java Sat Jan 30 18:42:23 2016
@@ -30,12 +30,12 @@ public final class NSUtil {
public static void validateName(String name) throws DOMException {
if (name.length() == 0) {
- throw DOMExceptionTranslator.newDOMException(DOMException.INVALID_CHARACTER_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.INVALID_CHARACTER_ERR);
}
for (int i=0; i<name.length(); i++) {
char c = name.charAt(i);
if (i == 0 && !isNameStartChar(c) || i > 0 && !isNameChar(c)) {
- throw DOMExceptionTranslator.newDOMException(DOMException.INVALID_CHARACTER_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.INVALID_CHARACTER_ERR);
}
}
}
@@ -44,17 +44,17 @@ public final class NSUtil {
for (int i=0; i<prefix.length(); i++) {
char c = prefix.charAt(i);
if (c == ':') {
- throw DOMExceptionTranslator.newDOMException(DOMException.NAMESPACE_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.NAMESPACE_ERR);
}
if (i == 0 && !isNameStartChar(c) || i > 0 && !isNameChar(c)) {
- throw DOMExceptionTranslator.newDOMException(DOMException.INVALID_CHARACTER_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.INVALID_CHARACTER_ERR);
}
}
}
public static int validateQualifiedName(String qualifiedName) throws DOMException {
if (qualifiedName.length() == 0) {
- throw DOMExceptionTranslator.newDOMException(DOMException.INVALID_CHARACTER_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.INVALID_CHARACTER_ERR);
}
int colonPosition = -1;
boolean checkNameStart = true;
@@ -65,20 +65,20 @@ public final class NSUtil {
colonPosition = i;
checkNameStart = true;
} else {
- throw DOMExceptionTranslator.newDOMException(DOMException.NAMESPACE_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.NAMESPACE_ERR);
}
} else if (checkNameStart) {
if (!isNameStartChar(c)) {
- throw DOMExceptionTranslator.newDOMException(isNameChar(c) ? DOMException.NAMESPACE_ERR : DOMException.INVALID_CHARACTER_ERR);
+ throw DOMExceptionUtil.newDOMException(isNameChar(c) ? DOMException.NAMESPACE_ERR : DOMException.INVALID_CHARACTER_ERR);
}
checkNameStart = false;
} else if (!isNameChar(c)) {
- throw DOMExceptionTranslator.newDOMException(DOMException.INVALID_CHARACTER_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.INVALID_CHARACTER_ERR);
}
}
if (checkNameStart) {
// If we get here, then the qualified name ends with a colon
- throw DOMExceptionTranslator.newDOMException(DOMException.NAMESPACE_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.NAMESPACE_ERR);
}
return colonPosition;
}
@@ -89,20 +89,20 @@ public final class NSUtil {
public static void validateNamespace(String namespaceURI, String prefix) {
if (prefix.length() != 0 && namespaceURI.length() == 0) {
- throw DOMExceptionTranslator.newDOMException(DOMException.NAMESPACE_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.NAMESPACE_ERR);
}
if (XMLConstants.XML_NS_PREFIX.equals(prefix) && !XMLConstants.XML_NS_URI.equals(namespaceURI)) {
- throw DOMExceptionTranslator.newDOMException(DOMException.NAMESPACE_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.NAMESPACE_ERR);
}
}
public static void validateAttributeName(String namespaceURI, String localName, String prefix) {
validateNamespace(namespaceURI, prefix);
if (prefix.length() == 0 && localName.equals(XMLConstants.XMLNS_ATTRIBUTE) && !namespaceURI.equals(XMLConstants.XMLNS_ATTRIBUTE_NS_URI)) {
- throw DOMExceptionTranslator.newDOMException(DOMException.NAMESPACE_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.NAMESPACE_ERR);
}
if (XMLConstants.XMLNS_ATTRIBUTE.equals(prefix)) {
- throw DOMExceptionTranslator.newDOMException(DOMException.NAMESPACE_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.NAMESPACE_ERR);
}
}
@@ -112,7 +112,7 @@ public final class NSUtil {
} else if (prefix.length() == 0 && localName.equals(XMLConstants.XMLNS_ATTRIBUTE)) {
return "";
} else {
- throw DOMExceptionTranslator.newDOMException(DOMException.NAMESPACE_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.NAMESPACE_ERR);
}
}
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/test/java/org/apache/axiom/dom/DOMExceptionTranslatorTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/test/java/org/apache/axiom/dom/DOMExceptionTranslatorTest.java?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/test/java/org/apache/axiom/dom/DOMExceptionTranslatorTest.java (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/test/java/org/apache/axiom/dom/DOMExceptionTranslatorTest.java Sat Jan 30 18:42:23 2016
@@ -26,7 +26,7 @@ import org.w3c.dom.DOMException;
public class DOMExceptionTranslatorTest {
@Test
public void testMessage() {
- DOMException ex = DOMExceptionTranslator.newDOMException(DOMException.NOT_FOUND_ERR);
+ DOMException ex = DOMExceptionUtil.newDOMException(DOMException.NOT_FOUND_ERR);
assertThat(ex.getMessage()).isEqualTo(
"NOT_FOUND_ERR: An attempt is made to reference a node in a context where it does not exist.");
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj Sat Jan 30 18:42:23 2016
@@ -190,7 +190,7 @@ public aspect AxiomContainerSupport {
}
public Iterator<OMNode> AxiomContainer.getChildren() {
- return coreGetNodes(Axis.CHILDREN, OMNode.class, AxiomExceptionTranslator.INSTANCE, AxiomSemantics.INSTANCE);
+ return coreGetNodes(Axis.CHILDREN, OMNode.class, AxiomSemantics.INSTANCE);
}
public Iterator<OMElement> AxiomContainer.getChildrenWithLocalName(String localName) {
@@ -228,7 +228,7 @@ public aspect AxiomContainerSupport {
}
public Iterator<OMSerializable> AxiomContainer.getDescendants(boolean includeSelf) {
- return coreGetNodes(includeSelf ? Axis.DESCENDANTS_OR_SELF : Axis.DESCENDANTS, OMSerializable.class, AxiomExceptionTranslator.INSTANCE, AxiomSemantics.INSTANCE);
+ return coreGetNodes(includeSelf ? Axis.DESCENDANTS_OR_SELF : Axis.DESCENDANTS, OMSerializable.class, AxiomSemantics.INSTANCE);
}
public OMElement AxiomContainer.getFirstChildWithName(QName elementQName) throws OMException {
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomExceptionTranslator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomExceptionTranslator.java?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomExceptionTranslator.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomExceptionTranslator.java Sat Jan 30 18:42:23 2016
@@ -19,19 +19,12 @@
package org.apache.axiom.om.impl.common;
import org.apache.axiom.core.CoreModelException;
-import org.apache.axiom.core.ExceptionTranslator;
import org.apache.axiom.om.OMException;
-public class AxiomExceptionTranslator implements ExceptionTranslator {
- public static final AxiomExceptionTranslator INSTANCE = new AxiomExceptionTranslator();
-
+public class AxiomExceptionTranslator {
private AxiomExceptionTranslator() {}
public static OMException translate(CoreModelException ex) {
return new OMException(ex);
}
-
- public RuntimeException toUncheckedException(CoreModelException ex) {
- return translate(ex);
- }
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomSemantics.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomSemantics.java?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomSemantics.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomSemantics.java Sat Jan 30 18:42:23 2016
@@ -21,6 +21,7 @@ package org.apache.axiom.om.impl.common;
import org.apache.axiom.core.AttributeMatcher;
import org.apache.axiom.core.ClonePolicy;
import org.apache.axiom.core.CoreAttribute;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.DetachPolicy;
import org.apache.axiom.core.NSAwareAttributeMatcher;
@@ -94,4 +95,8 @@ public final class AxiomSemantics implem
}
}
};
+
+ public RuntimeException toUncheckedException(CoreModelException ex) {
+ return AxiomExceptionTranslator.translate(ex);
+ }
}
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java Sat Jan 30 18:42:23 2016
@@ -19,7 +19,7 @@
package org.apache.axiom.om.impl.dom;
-import static org.apache.axiom.dom.DOMExceptionTranslator.newDOMException;
+import static org.apache.axiom.dom.DOMExceptionUtil.newDOMException;
import java.util.Enumeration;
import java.util.Hashtable;
@@ -29,7 +29,7 @@ import java.util.Vector;
import org.apache.axiom.core.CoreChildNode;
import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.dom.DOMDocument;
-import org.apache.axiom.dom.DOMExceptionTranslator;
+import org.apache.axiom.dom.DOMExceptionUtil;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.intf.AxiomDocument;
import org.w3c.dom.Attr;
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java Sat Jan 30 18:42:23 2016
@@ -19,7 +19,7 @@
package org.apache.axiom.om.impl.dom;
-import static org.apache.axiom.dom.DOMExceptionTranslator.newDOMException;
+import static org.apache.axiom.dom.DOMExceptionUtil.newDOMException;
import org.apache.axiom.dom.DOMAttribute;
import org.apache.axiom.dom.DOMElement;
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java Sat Jan 30 18:42:23 2016
@@ -19,7 +19,7 @@
package org.apache.axiom.om.impl.dom;
-import static org.apache.axiom.dom.DOMExceptionTranslator.newDOMException;
+import static org.apache.axiom.dom.DOMExceptionUtil.newDOMException;
import org.apache.axiom.core.NodeFactory;
import org.apache.axiom.dom.DOMNode;
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java Sat Jan 30 18:42:23 2016
@@ -19,7 +19,7 @@
package org.apache.axiom.om.impl.dom;
-import static org.apache.axiom.dom.DOMExceptionTranslator.newDOMException;
+import static org.apache.axiom.dom.DOMExceptionUtil.newDOMException;
import org.apache.axiom.core.CoreChildNode;
import org.apache.axiom.core.CoreDocumentFragment;
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java?rev=1727743&r1=1727742&r2=1727743&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java Sat Jan 30 18:42:23 2016
@@ -19,7 +19,7 @@
package org.apache.axiom.om.impl.dom;
-import static org.apache.axiom.dom.DOMExceptionTranslator.newDOMException;
+import static org.apache.axiom.dom.DOMExceptionUtil.newDOMException;
import org.apache.axiom.dom.DOMTextNode;
import org.apache.axiom.om.impl.intf.AxiomText;