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/02/10 21:48:23 UTC
svn commit: r1729724 [1/2] - in /webservices/axiom/trunk:
aspects/core-aspects/
aspects/core-aspects/src/main/java/org/apache/axiom/core/
aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/
aspects/dom-aspects/src/main/java/org/apache/...
Author: veithen
Date: Wed Feb 10 20:48:22 2016
New Revision: 1729724
URL: http://svn.apache.org/viewvc?rev=1729724&view=rev
Log:
Remove the dependency on axiom-api from core-aspects, as intented by the design.
Added:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DeferredBuildingException.java (with props)
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NodeConsumedException.java (with props)
Modified:
webservices/axiom/trunk/aspects/core-aspects/pom.xml
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataSourceNode.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNode.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCharacterDataContainingParentNodeSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreElementSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreMixedContentContainerSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNodeSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMAttributeSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMChildNodeSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMCommentSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMDocumentFragmentSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMDocumentSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMElementSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMNodeSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMParentNodeSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMProcessingInstructionSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMTextNodeSupport.aj
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/impl/mixin/AbderaAttributeMixin.aj
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/impl/mixin/AbderaProcessingInstructionMixin.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/factory/OMFactoryImpl.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomAttributeSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCDATASectionSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomChildNodeSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocumentSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomInformationItemSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomNamespaceDeclarationSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomTextSupport.aj
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
Modified: webservices/axiom/trunk/aspects/core-aspects/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/pom.xml?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/pom.xml (original)
+++ webservices/axiom/trunk/aspects/core-aspects/pom.xml Wed Feb 10 20:48:22 2016
@@ -34,12 +34,6 @@
<dependencies>
<dependency>
- <!-- This dependency will eventually go away -->
- <groupId>${project.groupId}</groupId>
- <artifactId>axiom-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
</dependency>
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataSourceNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataSourceNode.java?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataSourceNode.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataSourceNode.java Wed Feb 10 20:48:22 2016
@@ -19,5 +19,5 @@
package org.apache.axiom.core;
public interface CoreCharacterDataSourceNode extends CoreNode {
- Object coreGetCharacterData();
+ Object coreGetCharacterData() throws CoreModelException;
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNode.java?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNode.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNode.java Wed Feb 10 20:48:22 2016
@@ -41,8 +41,8 @@ public interface CoreNode {
* the policy to use when cloning this node (and its children)
* @return the clone of this node
*/
- <T> CoreNode coreClone(ClonePolicy<T> policy, T options);
+ <T> CoreNode coreClone(ClonePolicy<T> policy, T options) throws CoreModelException;
- <T> void init(ClonePolicy<T> policy, T options, CoreNode other);
- <T> void cloneChildrenIfNecessary(ClonePolicy<T> policy, T options, CoreNode clone);
+ <T> void init(ClonePolicy<T> policy, T options, CoreNode other) throws CoreModelException;
+ <T> void cloneChildrenIfNecessary(ClonePolicy<T> policy, T options, CoreNode clone) throws CoreModelException;
}
Added: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DeferredBuildingException.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DeferredBuildingException.java?rev=1729724&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DeferredBuildingException.java (added)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DeferredBuildingException.java Wed Feb 10 20:48:22 2016
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.core;
+
+public abstract class DeferredBuildingException extends CoreModelException {
+ private static final long serialVersionUID = 1L;
+
+ public DeferredBuildingException() {
+ super();
+ }
+
+ public DeferredBuildingException(String message) {
+ super(message);
+ }
+
+ public DeferredBuildingException(Throwable cause) {
+ super(cause);
+ }
+}
Propchange: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DeferredBuildingException.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NodeConsumedException.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NodeConsumedException.java?rev=1729724&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NodeConsumedException.java (added)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NodeConsumedException.java Wed Feb 10 20:48:22 2016
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.core;
+
+/**
+ * Indicates that a requested node has been consumed and is no longer available.
+ */
+public class NodeConsumedException extends DeferredBuildingException {
+ private static final long serialVersionUID = 1L;
+
+ public NodeConsumedException() {
+ }
+}
Propchange: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NodeConsumedException.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCharacterDataContainingParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCharacterDataContainingParentNodeSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCharacterDataContainingParentNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCharacterDataContainingParentNodeSupport.aj Wed Feb 10 20:48:22 2016
@@ -19,10 +19,11 @@
package org.apache.axiom.core.impl.mixin;
import org.apache.axiom.core.CoreCharacterDataContainingParentNode;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.ElementAction;
public aspect CoreCharacterDataContainingParentNodeSupport {
- public final Object CoreCharacterDataContainingParentNode.coreGetCharacterData() {
+ public final Object CoreCharacterDataContainingParentNode.coreGetCharacterData() throws CoreModelException {
Object characterData = internalGetCharacterData(ElementAction.RETURN_NULL);
if (characterData == null) {
throw new IllegalStateException();
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj Wed Feb 10 20:48:22 2016
@@ -28,11 +28,11 @@ import org.apache.axiom.core.CoreModelEx
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.core.NoParentException;
+import org.apache.axiom.core.NodeConsumedException;
import org.apache.axiom.core.NodeFilter;
import org.apache.axiom.core.SelfRelationshipException;
import org.apache.axiom.core.Semantics;
import org.apache.axiom.core.impl.Flags;
-import org.apache.axiom.om.NodeUnavailableException;
public aspect CoreChildNodeSupport {
private CoreParentNode CoreChildNode.owner;
@@ -113,7 +113,7 @@ public aspect CoreChildNodeSupport {
this.previousSibling = previousSibling;
}
- public final CoreChildNode CoreChildNode.coreGetNextSibling() {
+ public final CoreChildNode CoreChildNode.coreGetNextSibling() throws CoreModelException {
CoreChildNode nextSibling = coreGetNextSiblingIfAvailable();
if (nextSibling == null) {
CoreParentNode parent = coreGetParent();
@@ -121,7 +121,7 @@ public aspect CoreChildNodeSupport {
switch (parent.getState()) {
case CoreParentNode.DISCARDED:
parent.coreGetBuilder().debugDiscarded(parent);
- throw new NodeUnavailableException();
+ throw new NodeConsumedException();
case CoreParentNode.INCOMPLETE:
do {
parent.buildNext();
@@ -133,7 +133,7 @@ public aspect CoreChildNodeSupport {
return nextSibling;
}
- public final CoreChildNode CoreChildNode.coreGetNextSibling(NodeFilter filter) {
+ public final CoreChildNode CoreChildNode.coreGetNextSibling(NodeFilter filter) throws CoreModelException {
CoreChildNode sibling = coreGetNextSibling();
while (sibling != null && !filter.accept(sibling)) {
sibling = sibling.coreGetNextSibling();
@@ -260,7 +260,7 @@ public aspect CoreChildNodeSupport {
}
}
- public final <T> CoreNode CoreChildNode.coreClone(ClonePolicy<T> policy, T options, CoreParentNode targetParent) {
+ public final <T> CoreNode CoreChildNode.coreClone(ClonePolicy<T> policy, T options, CoreParentNode targetParent) throws CoreModelException {
return internalClone(policy, options, targetParent);
}
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentSupport.aj Wed Feb 10 20:48:22 2016
@@ -22,6 +22,7 @@ import org.apache.axiom.core.ClonePolicy
import org.apache.axiom.core.CoreChildNode;
import org.apache.axiom.core.CoreDocument;
import org.apache.axiom.core.CoreElement;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.NodeType;
@@ -45,7 +46,7 @@ public aspect CoreDocumentSupport {
}
}
- public final CoreElement CoreDocument.coreGetDocumentElement() {
+ public final CoreElement CoreDocument.coreGetDocumentElement() throws CoreModelException {
CoreChildNode child = coreGetFirstChild();
while (child != null) {
if (child instanceof CoreElement) {
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreElementSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreElementSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreElementSupport.aj Wed Feb 10 20:48:22 2016
@@ -24,6 +24,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.CoreNamespaceDeclaration;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.CoreParentNode;
@@ -146,7 +147,7 @@ public aspect CoreElementSupport {
public abstract String CoreElement.getImplicitNamespaceURI(String prefix);
- public final String CoreElement.coreLookupNamespaceURI(String prefix, Semantics semantics) {
+ public final String CoreElement.coreLookupNamespaceURI(String prefix, Semantics semantics) throws CoreModelException {
if (!semantics.isUseStrictNamespaceLookup()) {
String namespaceURI = getImplicitNamespaceURI(prefix);
if (namespaceURI != null) {
@@ -173,7 +174,7 @@ public aspect CoreElementSupport {
public abstract String CoreElement.getImplicitPrefix(String namespaceURI);
- public final String CoreElement.coreLookupPrefix(String namespaceURI, Semantics semantics) {
+ public final String CoreElement.coreLookupPrefix(String namespaceURI, Semantics semantics) throws CoreModelException {
if (namespaceURI == null) {
throw new IllegalArgumentException("namespaceURI must not be null");
}
@@ -213,7 +214,7 @@ public aspect CoreElementSupport {
}
}
- public final <T> void CoreElement.init(ClonePolicy<T> policy, T options, CoreNode other) {
+ public final <T> void CoreElement.init(ClonePolicy<T> policy, T options, CoreNode other) throws CoreModelException {
CoreElement o = (CoreElement)other;
initSource(policy, options, o);
initName(o);
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreMixedContentContainerSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreMixedContentContainerSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreMixedContentContainerSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreMixedContentContainerSupport.aj Wed Feb 10 20:48:22 2016
@@ -19,10 +19,11 @@
package org.apache.axiom.core.impl.mixin;
import org.apache.axiom.core.CoreMixedContentContainer;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.ElementAction;
public aspect CoreMixedContentContainerSupport {
- public final Object CoreMixedContentContainer.coreGetCharacterData(ElementAction elementAction) {
+ public final Object CoreMixedContentContainer.coreGetCharacterData(ElementAction elementAction) throws CoreModelException {
return internalGetCharacterData(elementAction);
}
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNodeSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNodeSupport.aj Wed Feb 10 20:48:22 2016
@@ -21,6 +21,7 @@ package org.apache.axiom.core.impl.mixin
import org.apache.axiom.core.ClonePolicy;
import org.apache.axiom.core.CoreChildNode;
import org.apache.axiom.core.CoreDocument;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.CoreParentNode;
@@ -82,14 +83,14 @@ public aspect CoreNodeSupport {
}
// TODO: merge this into internalClone once it is no longer referenced elsewhere
- public final <T> CoreNode CoreNode.shallowClone(ClonePolicy<T> policy, T options) {
+ public final <T> CoreNode CoreNode.shallowClone(ClonePolicy<T> policy, T options) throws CoreModelException {
CoreNode clone = coreGetNodeFactory().createNode(policy.getTargetNodeClass(options, this));
clone.init(policy, options, this);
clone.initAncillaryData(policy, options, this);
return clone;
}
- final <T> CoreNode CoreNode.internalClone(ClonePolicy<T> policy, T options, CoreParentNode targetParent) {
+ final <T> CoreNode CoreNode.internalClone(ClonePolicy<T> policy, T options, CoreParentNode targetParent) throws CoreModelException {
CoreNode clone = shallowClone(policy, options);
if (targetParent != null) {
targetParent.coreAppendChild((CoreChildNode)clone, false);
@@ -99,7 +100,7 @@ public aspect CoreNodeSupport {
return clone;
}
- public final <T> CoreNode CoreNode.coreClone(ClonePolicy<T> policy, T options) {
+ public final <T> CoreNode CoreNode.coreClone(ClonePolicy<T> policy, T options) throws CoreModelException {
return internalClone(policy, options, null);
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj Wed Feb 10 20:48:22 2016
@@ -30,20 +30,19 @@ import org.apache.axiom.core.CoreChildNo
import org.apache.axiom.core.CoreDocument;
import org.apache.axiom.core.CoreDocumentFragment;
import org.apache.axiom.core.CoreElement;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.core.ElementAction;
import org.apache.axiom.core.ElementMatcher;
import org.apache.axiom.core.Mapper;
+import org.apache.axiom.core.NodeConsumedException;
import org.apache.axiom.core.NodeFilter;
import org.apache.axiom.core.NodeIterator;
import org.apache.axiom.core.Semantics;
import org.apache.axiom.core.impl.ElementsIterator;
import org.apache.axiom.core.impl.Flags;
import org.apache.axiom.core.impl.NodesIterator;
-import org.apache.axiom.om.NodeUnavailableException;
-import org.apache.axiom.om.OMContainer;
-import org.apache.axiom.om.OMNode;
public aspect CoreParentNodeSupport {
private Object CoreParentNode.content;
@@ -120,13 +119,13 @@ public aspect CoreParentNodeSupport {
}
}
- public CoreChildNode CoreParentNode.coreGetFirstChild() {
+ public CoreChildNode CoreParentNode.coreGetFirstChild() throws CoreModelException {
CoreChildNode firstChild = coreGetFirstChildIfAvailable();
if (firstChild == null) {
switch (getState()) {
case CoreParentNode.DISCARDED:
coreGetBuilder().debugDiscarded(this);
- throw new NodeUnavailableException();
+ throw new NodeConsumedException();
case CoreParentNode.INCOMPLETE:
do {
buildNext();
@@ -137,7 +136,7 @@ public aspect CoreParentNodeSupport {
return firstChild;
}
- public final CoreChildNode CoreParentNode.coreGetFirstChild(NodeFilter filter) {
+ public final CoreChildNode CoreParentNode.coreGetFirstChild(NodeFilter filter) throws CoreModelException {
CoreChildNode child = coreGetFirstChild();
while (child != null && !filter.accept(child)) {
child = child.coreGetNextSibling();
@@ -240,7 +239,7 @@ public aspect CoreParentNodeSupport {
}
}
- final Object CoreParentNode.internalGetCharacterData(ElementAction elementAction) {
+ final Object CoreParentNode.internalGetCharacterData(ElementAction elementAction) throws CoreModelException {
if (getState() == COMPACT) {
return (String)content;
} else {
@@ -323,7 +322,7 @@ public aspect CoreParentNodeSupport {
return new ElementsIterator<T,S>(this, axis, type, matcher, namespaceURI, name, mapper, semantics);
}
- public final <T> void CoreParentNode.cloneChildrenIfNecessary(ClonePolicy<T> policy, T options, CoreNode clone) {
+ public final <T> void CoreParentNode.cloneChildrenIfNecessary(ClonePolicy<T> policy, T options, CoreNode clone) throws CoreModelException {
CoreParentNode targetParent = (CoreParentNode)clone;
if (policy.cloneChildren(options, coreGetNodeType()) && targetParent.isExpanded()) {
if (getState() == COMPACT) {
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMAttributeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMAttributeSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMAttributeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMAttributeSupport.aj Wed Feb 10 20:48:22 2016
@@ -19,7 +19,9 @@
package org.apache.axiom.dom.impl.mixin;
import org.apache.axiom.core.CoreElement;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.dom.DOMAttribute;
+import org.apache.axiom.dom.DOMExceptionUtil;
import org.apache.axiom.dom.DOMSemantics;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
@@ -64,7 +66,11 @@ public aspect DOMAttributeSupport {
}
public final String DOMAttribute.getValue() {
- return coreGetCharacterData().toString();
+ try {
+ return coreGetCharacterData().toString();
+ } catch (CoreModelException ex) {
+ throw DOMExceptionUtil.toUncheckedException(ex);
+ }
}
public final void DOMAttribute.setValue(String value) {
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMChildNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMChildNodeSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMChildNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMChildNodeSupport.aj Wed Feb 10 20:48:22 2016
@@ -18,8 +18,10 @@
*/
package org.apache.axiom.dom.impl.mixin;
-import org.apache.axiom.dom.DocumentWhitespaceFilter;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.dom.DOMChildNode;
+import org.apache.axiom.dom.DOMExceptionUtil;
+import org.apache.axiom.dom.DocumentWhitespaceFilter;
import org.w3c.dom.Node;
public aspect DOMChildNodeSupport {
@@ -28,7 +30,11 @@ public aspect DOMChildNodeSupport {
}
public final Node DOMChildNode.getNextSibling() {
- return (Node)coreGetNextSibling(DocumentWhitespaceFilter.INSTANCE);
+ try {
+ return (Node)coreGetNextSibling(DocumentWhitespaceFilter.INSTANCE);
+ } catch (CoreModelException ex) {
+ throw DOMExceptionUtil.toUncheckedException(ex);
+ }
}
public final Node DOMChildNode.getPreviousSibling() {
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMCommentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMCommentSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMCommentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMCommentSupport.aj Wed Feb 10 20:48:22 2016
@@ -18,7 +18,9 @@
*/
package org.apache.axiom.dom.impl.mixin;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.dom.DOMComment;
+import org.apache.axiom.dom.DOMExceptionUtil;
import org.apache.axiom.dom.DOMSemantics;
import org.w3c.dom.Node;
@@ -32,7 +34,11 @@ public aspect DOMCommentSupport {
}
public final String DOMComment.getData() {
- return coreGetCharacterData().toString();
+ try {
+ return coreGetCharacterData().toString();
+ } catch (CoreModelException ex) {
+ throw DOMExceptionUtil.toUncheckedException(ex);
+ }
}
public final void DOMComment.setData(String data) {
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMDocumentFragmentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMDocumentFragmentSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMDocumentFragmentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMDocumentFragmentSupport.aj Wed Feb 10 20:48:22 2016
@@ -21,8 +21,10 @@ package org.apache.axiom.dom.impl.mixin;
import static org.apache.axiom.dom.DOMExceptionUtil.newDOMException;
import org.apache.axiom.core.CoreElement;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.ElementAction;
import org.apache.axiom.dom.DOMDocumentFragment;
+import org.apache.axiom.dom.DOMExceptionUtil;
import org.apache.axiom.dom.DOMSemantics;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
@@ -78,7 +80,11 @@ public aspect DOMDocumentFragmentSupport
}
public final String DOMDocumentFragment.getTextContent() {
- return coreGetCharacterData(ElementAction.RECURSE).toString();
+ try {
+ return coreGetCharacterData(ElementAction.RECURSE).toString();
+ } catch (CoreModelException ex) {
+ throw DOMExceptionUtil.toUncheckedException(ex);
+ }
}
public final void DOMDocumentFragment.setTextContent(String textContent) {
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMDocumentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMDocumentSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMDocumentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMDocumentSupport.aj Wed Feb 10 20:48:22 2016
@@ -21,6 +21,7 @@ package org.apache.axiom.dom.impl.mixin;
import javax.xml.XMLConstants;
import org.apache.axiom.core.CoreElement;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.dom.DOMCDATASection;
import org.apache.axiom.dom.DOMComment;
import org.apache.axiom.dom.DOMConfigurationImpl;
@@ -109,11 +110,19 @@ public aspect DOMDocumentSupport {
}
public final Element DOMDocument.getDocumentElement() {
- return (Element)coreGetDocumentElement();
+ try {
+ return (Element)coreGetDocumentElement();
+ } catch (CoreModelException ex) {
+ throw DOMExceptionUtil.toUncheckedException(ex);
+ }
}
public final CoreElement DOMDocument.getNamespaceContext() {
- return coreGetDocumentElement();
+ try {
+ return coreGetDocumentElement();
+ } catch (CoreModelException ex) {
+ throw DOMExceptionUtil.toUncheckedException(ex);
+ }
}
public final DOMImplementation DOMDocument.getImplementation() {
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMElementSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMElementSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMElementSupport.aj Wed Feb 10 20:48:22 2016
@@ -22,6 +22,7 @@ import javax.xml.XMLConstants;
import org.apache.axiom.core.AttributeMatcher;
import org.apache.axiom.core.CoreElement;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.CoreNSAwareAttribute;
import org.apache.axiom.core.CoreNamespaceDeclaration;
import org.apache.axiom.core.ElementAction;
@@ -200,7 +201,11 @@ public aspect DOMElementSupport {
}
public final String DOMElement.getTextContent() {
- return coreGetCharacterData(ElementAction.RECURSE).toString();
+ try {
+ return coreGetCharacterData(ElementAction.RECURSE).toString();
+ } catch (CoreModelException ex) {
+ throw DOMExceptionUtil.toUncheckedException(ex);
+ }
}
public final void DOMElement.setTextContent(String textContent) {
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMNodeSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMNodeSupport.aj Wed Feb 10 20:48:22 2016
@@ -19,8 +19,10 @@
package org.apache.axiom.dom.impl.mixin;
import org.apache.axiom.core.CoreElement;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.dom.DOMConfigurationImpl;
import org.apache.axiom.dom.DOMDocument;
+import org.apache.axiom.dom.DOMExceptionUtil;
import org.apache.axiom.dom.DOMNode;
import org.apache.axiom.dom.DOMNodeFactory;
import org.apache.axiom.dom.DOMSemantics;
@@ -37,48 +39,64 @@ public aspect DOMNodeSupport {
}
public final String DOMNode.lookupNamespaceURI(String prefix) {
- CoreElement context = getNamespaceContext();
- if (context == null) {
- return null;
+ try {
+ CoreElement context = getNamespaceContext();
+ if (context == null) {
+ return null;
+ }
+ if (prefix == null) {
+ prefix = "";
+ } else if (prefix.length() == 0) {
+ return null;
+ }
+ String namespaceURI = context.coreLookupNamespaceURI(prefix, DOMSemantics.INSTANCE);
+ return namespaceURI == null || namespaceURI.length() == 0 ? null : namespaceURI;
+ } catch (CoreModelException ex) {
+ throw DOMExceptionUtil.toUncheckedException(ex);
}
- if (prefix == null) {
- prefix = "";
- } else if (prefix.length() == 0) {
- return null;
- }
- String namespaceURI = context.coreLookupNamespaceURI(prefix, DOMSemantics.INSTANCE);
- return namespaceURI == null || namespaceURI.length() == 0 ? null : namespaceURI;
}
public final String DOMNode.lookupPrefix(String namespaceURI) {
- CoreElement context = getNamespaceContext();
- if (context == null) {
- return null;
- }
- if (namespaceURI == null) {
- return null;
- } else {
- String prefix = context.coreLookupPrefix(namespaceURI, DOMSemantics.INSTANCE);
- return prefix == null || prefix.length() == 0 ? null : prefix;
+ try {
+ CoreElement context = getNamespaceContext();
+ if (context == null) {
+ return null;
+ }
+ if (namespaceURI == null) {
+ return null;
+ } else {
+ String prefix = context.coreLookupPrefix(namespaceURI, DOMSemantics.INSTANCE);
+ return prefix == null || prefix.length() == 0 ? null : prefix;
+ }
+ } catch (CoreModelException ex) {
+ throw DOMExceptionUtil.toUncheckedException(ex);
}
}
public final boolean DOMNode.isDefaultNamespace(String namespaceURI) {
- CoreElement context = getNamespaceContext();
- if (context == null) {
- return false;
- }
- if (namespaceURI == null) {
- namespaceURI = "";
+ try {
+ CoreElement context = getNamespaceContext();
+ if (context == null) {
+ return false;
+ }
+ if (namespaceURI == null) {
+ namespaceURI = "";
+ }
+ return namespaceURI.equals(context.coreLookupNamespaceURI("", DOMSemantics.INSTANCE));
+ } catch (CoreModelException ex) {
+ throw DOMExceptionUtil.toUncheckedException(ex);
}
- return namespaceURI.equals(context.coreLookupNamespaceURI("", DOMSemantics.INSTANCE));
}
public final Node DOMNode.cloneNode(boolean deep) {
- DOMNode clone = (DOMNode)coreClone(deep ? DOMSemantics.DEEP_CLONE : DOMSemantics.SHALLOW_CLONE, null);
- if (!(clone instanceof DOMDocument)) {
- clone.coreSetOwnerDocument(coreGetOwnerDocument(true));
+ try {
+ DOMNode clone = (DOMNode)coreClone(deep ? DOMSemantics.DEEP_CLONE : DOMSemantics.SHALLOW_CLONE, null);
+ if (!(clone instanceof DOMDocument)) {
+ clone.coreSetOwnerDocument(coreGetOwnerDocument(true));
+ }
+ return clone;
+ } catch (CoreModelException ex) {
+ throw DOMExceptionUtil.toUncheckedException(ex);
}
- return clone;
}
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMParentNodeSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMParentNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMParentNodeSupport.aj Wed Feb 10 20:48:22 2016
@@ -18,10 +18,10 @@
*/
package org.apache.axiom.dom.impl.mixin;
-import static org.apache.axiom.dom.DOMExceptionUtil.newDOMException;
-
import org.apache.axiom.core.CoreChildNode;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.dom.DOMConfigurationImpl;
+import org.apache.axiom.dom.DOMExceptionUtil;
import org.apache.axiom.dom.DOMNode;
import org.apache.axiom.dom.DOMParentNode;
import org.apache.axiom.dom.DOMSemantics;
@@ -60,7 +60,11 @@ public aspect DOMParentNodeSupport {
}
public final Node DOMParentNode.getFirstChild() {
- return (Node)coreGetFirstChild(DocumentWhitespaceFilter.INSTANCE);
+ try {
+ return (Node)coreGetFirstChild(DocumentWhitespaceFilter.INSTANCE);
+ } catch (CoreModelException ex) {
+ throw DOMExceptionUtil.toUncheckedException(ex);
+ }
}
public final Node DOMParentNode.getLastChild() {
@@ -76,15 +80,19 @@ public aspect DOMParentNodeSupport {
((CoreChildNode)oldChild).coreDetach(DOMSemantics.INSTANCE);
return oldChild;
} else {
- throw newDOMException(DOMException.NOT_FOUND_ERR);
+ throw DOMExceptionUtil.newDOMException(DOMException.NOT_FOUND_ERR);
}
}
public void DOMParentNode.normalize(DOMConfigurationImpl config) {
- CoreChildNode child = coreGetFirstChild();
- while (child != null) {
- ((DOMNode)child).normalize(config);
- child = child.coreGetNextSibling();
+ try {
+ CoreChildNode child = coreGetFirstChild();
+ while (child != null) {
+ ((DOMNode)child).normalize(config);
+ child = child.coreGetNextSibling();
+ }
+ } catch (CoreModelException ex) {
+ throw DOMExceptionUtil.toUncheckedException(ex);
}
}
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMProcessingInstructionSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMProcessingInstructionSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMProcessingInstructionSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMProcessingInstructionSupport.aj Wed Feb 10 20:48:22 2016
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.dom.impl.mixin;
+import org.apache.axiom.core.CoreModelException;
+import org.apache.axiom.dom.DOMExceptionUtil;
import org.apache.axiom.dom.DOMProcessingInstruction;
import org.apache.axiom.dom.DOMSemantics;
import org.w3c.dom.Node;
@@ -28,7 +30,11 @@ public aspect DOMProcessingInstructionSu
}
public final String DOMProcessingInstruction.getData() {
- return coreGetCharacterData().toString();
+ try {
+ return coreGetCharacterData().toString();
+ } catch (CoreModelException ex) {
+ throw DOMExceptionUtil.toUncheckedException(ex);
+ }
}
public final void DOMProcessingInstruction.setData(String data) {
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMTextNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMTextNodeSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMTextNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/impl/mixin/DOMTextNodeSupport.aj Wed Feb 10 20:48:22 2016
@@ -42,35 +42,43 @@ public aspect DOMTextNodeSupport {
}
private DOMTextNode DOMTextNode.getWholeTextEndNode() {
- DOMTextNode last = this;
- while (true) {
- CoreChildNode sibling = last.coreGetNextSibling();
- if (sibling instanceof DOMTextNode) {
- last = (DOMTextNode)sibling;
- } else {
- break;
+ try {
+ DOMTextNode last = this;
+ while (true) {
+ CoreChildNode sibling = last.coreGetNextSibling();
+ if (sibling instanceof DOMTextNode) {
+ last = (DOMTextNode)sibling;
+ } else {
+ break;
+ }
}
+ return last;
+ } catch (CoreModelException ex) {
+ throw DOMExceptionUtil.toUncheckedException(ex);
}
- return last;
}
public final String DOMTextNode.getWholeText() {
- DOMTextNode first = getWholeTextStartNode();
- DOMTextNode last = getWholeTextEndNode();
- if (first == last) {
- return first.getData();
- } else {
- StringBuilder buffer = new StringBuilder();
- DOMTextNode current = first;
- while (true) {
- buffer.append(current.getData());
- if (current == last) {
- break;
- } else {
- current = (DOMTextNode)current.coreGetNextSibling();
+ try {
+ DOMTextNode first = getWholeTextStartNode();
+ DOMTextNode last = getWholeTextEndNode();
+ if (first == last) {
+ return first.getData();
+ } else {
+ StringBuilder buffer = new StringBuilder();
+ DOMTextNode current = first;
+ while (true) {
+ buffer.append(current.getData());
+ if (current == last) {
+ break;
+ } else {
+ current = (DOMTextNode)current.coreGetNextSibling();
+ }
}
+ return buffer.toString();
}
- return buffer.toString();
+ } catch (CoreModelException ex) {
+ throw DOMExceptionUtil.toUncheckedException(ex);
}
}
Modified: webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/impl/mixin/AbderaAttributeMixin.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/impl/mixin/AbderaAttributeMixin.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/impl/mixin/AbderaAttributeMixin.aj (original)
+++ webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/impl/mixin/AbderaAttributeMixin.aj Wed Feb 10 20:48:22 2016
@@ -18,12 +18,17 @@
package org.apache.axiom.fom.impl.mixin;
import org.apache.abdera.model.Attribute;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.fom.AbderaAttribute;
import org.apache.axiom.fom.FOMSemantics;
public aspect AbderaAttributeMixin {
public final String AbderaAttribute.getText() {
- return coreGetCharacterData().toString();
+ try {
+ return coreGetCharacterData().toString();
+ } catch (CoreModelException ex) {
+ throw FOMSemantics.INSTANCE.toUncheckedException(ex);
+ }
}
public final Attribute AbderaAttribute.setText(String text) {
Modified: webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/impl/mixin/AbderaProcessingInstructionMixin.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/impl/mixin/AbderaProcessingInstructionMixin.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/impl/mixin/AbderaProcessingInstructionMixin.aj (original)
+++ webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/impl/mixin/AbderaProcessingInstructionMixin.aj Wed Feb 10 20:48:22 2016
@@ -19,12 +19,17 @@
package org.apache.axiom.fom.impl.mixin;
import org.apache.abdera.model.ProcessingInstruction;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.fom.AbderaProcessingInstruction;
import org.apache.axiom.fom.FOMSemantics;
public aspect AbderaProcessingInstructionMixin {
public final String AbderaProcessingInstruction.getText() {
- return coreGetCharacterData().toString();
+ try {
+ return coreGetCharacterData().toString();
+ } catch (CoreModelException ex) {
+ throw FOMSemantics.INSTANCE.toUncheckedException(ex);
+ }
}
@SuppressWarnings("unchecked")
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=1729724&r1=1729723&r2=1729724&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 Wed Feb 10 20:48:22 2016
@@ -21,6 +21,8 @@ package org.apache.axiom.om.impl.common;
import javax.xml.stream.XMLStreamException;
import org.apache.axiom.core.CoreModelException;
+import org.apache.axiom.core.NodeConsumedException;
+import org.apache.axiom.om.NodeUnavailableException;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.impl.stream.StreamException;
@@ -28,7 +30,11 @@ public class AxiomExceptionTranslator {
private AxiomExceptionTranslator() {}
public static OMException translate(CoreModelException ex) {
- return new OMException(ex);
+ if (ex instanceof NodeConsumedException) {
+ return new NodeUnavailableException();
+ } else {
+ return new OMException(ex);
+ }
}
public static XMLStreamException toXMLStreamException(StreamException ex) {
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java Wed Feb 10 20:48:22 2016
@@ -22,6 +22,7 @@ import static org.apache.axiom.util.xml.
import javax.xml.namespace.QName;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.NodeFactory;
import org.apache.axiom.ext.stax.datahandler.DataHandlerProvider;
@@ -41,8 +42,9 @@ import org.apache.axiom.om.OMProcessingI
import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.OMText;
import org.apache.axiom.om.OMXMLBuilderFactory;
-import org.apache.axiom.om.impl.common.OMNamespaceImpl;
+import org.apache.axiom.om.impl.common.AxiomExceptionTranslator;
import org.apache.axiom.om.impl.common.AxiomSemantics;
+import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.intf.AxiomAttribute;
import org.apache.axiom.om.impl.intf.AxiomCDATASection;
import org.apache.axiom.om.impl.intf.AxiomCharacterDataNode;
@@ -169,8 +171,12 @@ public class OMFactoryImpl implements OM
}
public final OMText createOMText(OMContainer parent, OMText source) {
- // TODO: this doesn't necessarily produce a node with the expected OMFactory
- return (AxiomText)((AxiomText)source).coreClone(AxiomSemantics.CLONE_POLICY, null, (AxiomContainer)parent);
+ try {
+ // TODO: this doesn't necessarily produce a node with the expected OMFactory
+ return (AxiomText)((AxiomText)source).coreClone(AxiomSemantics.CLONE_POLICY, null, (AxiomContainer)parent);
+ } catch (CoreModelException ex) {
+ throw AxiomExceptionTranslator.translate(ex);
+ }
}
public final OMText createOMText(Object dataHandler, boolean optimize) {
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java Wed Feb 10 20:48:22 2016
@@ -39,6 +39,7 @@ import org.apache.axiom.core.CoreCharact
import org.apache.axiom.core.CoreChildNode;
import org.apache.axiom.core.CoreDocument;
import org.apache.axiom.core.CoreElement;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.CoreNSAwareAttribute;
import org.apache.axiom.core.CoreNamespaceDeclaration;
import org.apache.axiom.core.CoreNode;
@@ -61,6 +62,7 @@ import org.apache.axiom.om.OMProcessingI
import org.apache.axiom.om.OMSerializable;
import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.OMText;
+import org.apache.axiom.om.impl.common.AxiomExceptionTranslator;
import org.apache.axiom.om.impl.common.util.OMDataSourceUtil;
import org.apache.axiom.util.namespace.MapBasedNamespaceContext;
import org.apache.axiom.util.stax.XMLEventUtils;
@@ -269,14 +271,18 @@ final class Navigator extends PullSerial
* @return the text for the current node
*/
private String getTextFromNode() {
- switch (currentEvent) {
- case CHARACTERS:
- case CDATA:
- case SPACE:
- case COMMENT:
- return ((CoreCharacterDataContainer)node).coreGetCharacterData().toString();
- default:
- throw new IllegalStateException();
+ try {
+ switch (currentEvent) {
+ case CHARACTERS:
+ case CDATA:
+ case SPACE:
+ case COMMENT:
+ return ((CoreCharacterDataContainer)node).coreGetCharacterData().toString();
+ default:
+ throw new IllegalStateException();
+ }
+ } catch (CoreModelException ex) {
+ throw AxiomExceptionTranslator.translate(ex);
}
}
@@ -384,10 +390,14 @@ final class Navigator extends PullSerial
}
String getNamespaceURI(int i) {
- if (currentEvent == START_ELEMENT || currentEvent == END_ELEMENT) {
- return getNamespace(i).coreGetCharacterData().toString();
- } else {
- throw new IllegalStateException();
+ try {
+ if (currentEvent == START_ELEMENT || currentEvent == END_ELEMENT) {
+ return getNamespace(i).coreGetCharacterData().toString();
+ } else {
+ throw new IllegalStateException();
+ }
+ } catch (CoreModelException ex) {
+ throw AxiomExceptionTranslator.translate(ex);
}
}
@@ -421,11 +431,15 @@ final class Navigator extends PullSerial
}
String getAttributeValue(int i) {
- if (currentEvent == START_ELEMENT) {
- return getAttribute(i).coreGetCharacterData().toString();
- } else {
- throw new IllegalStateException(
- "attribute type accessed in illegal event!");
+ try {
+ if (currentEvent == START_ELEMENT) {
+ return getAttribute(i).coreGetCharacterData().toString();
+ } else {
+ throw new IllegalStateException(
+ "attribute type accessed in illegal event!");
+ }
+ } catch (CoreModelException ex) {
+ throw AxiomExceptionTranslator.translate(ex);
}
}
@@ -554,46 +568,50 @@ final class Navigator extends PullSerial
* mode
*/
private boolean nextNode() {
- if (node == null) {
- // We get here if rootNode is an element and the current event is START_DOCUMENT
- assert !visited;
- node = rootNode;
- return true;
- } else if (node instanceof OMContainer && !visited) {
- CoreParentNode current = (CoreParentNode)node;
- CoreChildNode firstChild = cache ? current.coreGetFirstChild() : current.coreGetFirstChildIfAvailable();
- if (firstChild != null) {
- node = firstChild;
- visited = false;
+ try {
+ if (node == null) {
+ // We get here if rootNode is an element and the current event is START_DOCUMENT
+ assert !visited;
+ node = rootNode;
return true;
- } else if (current.getState() == CoreParentNode.COMPLETE || current.getState() == CoreParentNode.COMPACT) {
+ } else if (node instanceof OMContainer && !visited) {
+ CoreParentNode current = (CoreParentNode)node;
+ CoreChildNode firstChild = cache ? current.coreGetFirstChild() : current.coreGetFirstChildIfAvailable();
+ if (firstChild != null) {
+ node = firstChild;
+ visited = false;
+ return true;
+ } else if (current.getState() == CoreParentNode.COMPLETE || current.getState() == CoreParentNode.COMPACT) {
+ visited = true;
+ return true;
+ } else {
+ return false;
+ }
+ } else if (node == rootNode) {
+ // We get here if rootNode is an element and the next event is END_DOCUMENT
+ node = null;
visited = true;
return true;
} else {
- return false;
- }
- } else if (node == rootNode) {
- // We get here if rootNode is an element and the next event is END_DOCUMENT
- node = null;
- visited = true;
- return true;
- } else {
- CoreChildNode current = (CoreChildNode)node;
- CoreChildNode nextSibling = cache ? current.coreGetNextSibling() : current.coreGetNextSiblingIfAvailable();
- if (nextSibling != null) {
- node = nextSibling;
- visited = false;
- return true;
- } else {
- CoreParentNode parent = current.coreGetParent();
- node = parent;
- if (parent.getState() == CoreParentNode.COMPLETE || parent.getState() == CoreParentNode.COMPACT || parent.coreGetBuilder() == null) { // TODO: review this condition
- visited = true;
+ CoreChildNode current = (CoreChildNode)node;
+ CoreChildNode nextSibling = cache ? current.coreGetNextSibling() : current.coreGetNextSiblingIfAvailable();
+ if (nextSibling != null) {
+ node = nextSibling;
+ visited = false;
return true;
} else {
- return false;
+ CoreParentNode parent = current.coreGetParent();
+ node = parent;
+ if (parent.getState() == CoreParentNode.COMPLETE || parent.getState() == CoreParentNode.COMPACT || parent.coreGetBuilder() == null) { // TODO: review this condition
+ visited = true;
+ return true;
+ } else {
+ return false;
+ }
}
}
+ } catch (CoreModelException ex) {
+ throw AxiomExceptionTranslator.translate(ex);
}
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomAttributeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomAttributeSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomAttributeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomAttributeSupport.aj Wed Feb 10 20:48:22 2016
@@ -18,8 +18,10 @@
*/
package org.apache.axiom.om.impl.mixin;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.impl.common.AxiomExceptionTranslator;
import org.apache.axiom.om.impl.common.AxiomSemantics;
import org.apache.axiom.om.impl.common.NSUtil;
import org.apache.axiom.om.impl.intf.AxiomAttribute;
@@ -42,7 +44,11 @@ public aspect AxiomAttributeSupport {
}
public final String AxiomAttribute.getAttributeValue() {
- return coreGetCharacterData().toString();
+ try {
+ return coreGetCharacterData().toString();
+ } catch (CoreModelException ex) {
+ throw AxiomExceptionTranslator.translate(ex);
+ }
}
public final void AxiomAttribute.setAttributeValue(String value) {
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCDATASectionSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCDATASectionSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCDATASectionSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCDATASectionSupport.aj Wed Feb 10 20:48:22 2016
@@ -18,8 +18,10 @@
*/
package org.apache.axiom.om.impl.mixin;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMOutputFormat;
+import org.apache.axiom.om.impl.common.AxiomExceptionTranslator;
import org.apache.axiom.om.impl.intf.AxiomCDATASection;
import org.apache.axiom.om.impl.stream.StreamException;
import org.apache.axiom.om.impl.stream.XmlHandler;
@@ -30,6 +32,10 @@ public aspect AxiomCDATASectionSupport {
}
public final void AxiomCDATASection.internalSerialize(XmlHandler handler, OMOutputFormat format, boolean cache) throws StreamException {
- handler.processCDATASection(coreGetCharacterData().toString());
+ try {
+ handler.processCDATASection(coreGetCharacterData().toString());
+ } catch (CoreModelException ex) {
+ throw AxiomExceptionTranslator.translate(ex);
+ }
}
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomChildNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomChildNodeSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomChildNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomChildNodeSupport.aj Wed Feb 10 20:48:22 2016
@@ -35,7 +35,11 @@ public aspect AxiomChildNodeSupport {
}
public final OMNode AxiomChildNode.getNextOMSibling() {
- return (OMNode)coreGetNextSibling();
+ try {
+ return (OMNode)coreGetNextSibling();
+ } catch (CoreModelException ex) {
+ throw AxiomExceptionTranslator.translate(ex);
+ }
}
public final OMNode AxiomChildNode.getPreviousOMSibling() {
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentSupport.aj Wed Feb 10 20:48:22 2016
@@ -18,8 +18,10 @@
*/
package org.apache.axiom.om.impl.mixin;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMOutputFormat;
+import org.apache.axiom.om.impl.common.AxiomExceptionTranslator;
import org.apache.axiom.om.impl.common.AxiomSemantics;
import org.apache.axiom.om.impl.intf.AxiomComment;
import org.apache.axiom.om.impl.stream.StreamException;
@@ -31,7 +33,11 @@ public aspect AxiomCommentSupport {
}
public String AxiomComment.getValue() {
- return coreGetCharacterData().toString();
+ try {
+ return coreGetCharacterData().toString();
+ } catch (CoreModelException ex) {
+ throw AxiomExceptionTranslator.translate(ex);
+ }
}
public void AxiomComment.setValue(String text) {
@@ -39,7 +45,11 @@ public aspect AxiomCommentSupport {
}
public final void AxiomComment.internalSerialize(XmlHandler handler, OMOutputFormat format, boolean cache) throws StreamException {
- handler.processComment(coreGetCharacterData().toString());
+ try {
+ handler.processComment(coreGetCharacterData().toString());
+ } catch (CoreModelException ex) {
+ throw AxiomExceptionTranslator.translate(ex);
+ }
}
public final void AxiomComment.buildWithAttachments() {
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj Wed Feb 10 20:48:22 2016
@@ -31,6 +31,7 @@ import javax.xml.transform.sax.SAXSource
import org.apache.axiom.core.Axis;
import org.apache.axiom.core.Builder;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.CoreNSAwareElement;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.ElementMatcher;
@@ -194,7 +195,11 @@ public aspect AxiomContainerSupport {
}
public OMNode AxiomContainer.getFirstOMChild() {
- return (OMNode)coreGetFirstChild();
+ try {
+ return (OMNode)coreGetFirstChild();
+ } catch (CoreModelException ex) {
+ throw AxiomExceptionTranslator.translate(ex);
+ }
}
public void AxiomContainer.removeChildren() {
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocumentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocumentSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocumentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocumentSupport.aj Wed Feb 10 20:48:22 2016
@@ -18,10 +18,12 @@
*/
package org.apache.axiom.om.impl.mixin;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMOutputFormat;
+import org.apache.axiom.om.impl.common.AxiomExceptionTranslator;
import org.apache.axiom.om.impl.common.AxiomSemantics;
import org.apache.axiom.om.impl.intf.AxiomDocument;
import org.apache.axiom.om.impl.intf.AxiomElement;
@@ -30,18 +32,26 @@ import org.apache.axiom.om.impl.stream.X
public aspect AxiomDocumentSupport {
public final OMElement AxiomDocument.getOMDocumentElement() {
- return (OMElement)coreGetDocumentElement();
+ try {
+ return (OMElement)coreGetDocumentElement();
+ } catch (CoreModelException ex) {
+ throw AxiomExceptionTranslator.translate(ex);
+ }
}
public final void AxiomDocument.setOMDocumentElement(OMElement documentElement) {
- if (documentElement == null) {
- throw new IllegalArgumentException("documentElement must not be null");
- }
- AxiomElement existingDocumentElement = (AxiomElement)coreGetDocumentElement();
- if (existingDocumentElement == null) {
- addChild(documentElement);
- } else {
- existingDocumentElement.coreReplaceWith((AxiomElement)documentElement, AxiomSemantics.INSTANCE);
+ try {
+ if (documentElement == null) {
+ throw new IllegalArgumentException("documentElement must not be null");
+ }
+ AxiomElement existingDocumentElement = (AxiomElement)coreGetDocumentElement();
+ if (existingDocumentElement == null) {
+ addChild(documentElement);
+ } else {
+ existingDocumentElement.coreReplaceWith((AxiomElement)documentElement, AxiomSemantics.INSTANCE);
+ }
+ } catch (CoreModelException ex) {
+ throw AxiomExceptionTranslator.translate(ex);
}
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj Wed Feb 10 20:48:22 2016
@@ -38,6 +38,7 @@ import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.core.Axis;
import org.apache.axiom.core.CoreAttribute;
import org.apache.axiom.core.CoreElement;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.core.ElementAction;
import org.apache.axiom.core.ElementMatcher;
@@ -52,6 +53,7 @@ import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.OMText;
+import org.apache.axiom.om.impl.common.AxiomExceptionTranslator;
import org.apache.axiom.om.impl.common.AxiomSemantics;
import org.apache.axiom.om.impl.common.LiveNamespaceContext;
import org.apache.axiom.om.impl.common.NSUtil;
@@ -154,7 +156,11 @@ public aspect AxiomElementSupport {
// TODO: this is (incorrectly) overridden by the SOAPFaultReason implementations for SOAP 1.2
public String AxiomElement.getText() {
- return coreGetCharacterData(ElementAction.SKIP).toString();
+ try {
+ return coreGetCharacterData(ElementAction.SKIP).toString();
+ } catch (CoreModelException ex) {
+ throw AxiomExceptionTranslator.translate(ex);
+ }
}
// Note: must not be final because it is (incorrectly) overridden in the SOAPFaultCode implementation for SOAP 1.2
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomInformationItemSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomInformationItemSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomInformationItemSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomInformationItemSupport.aj Wed Feb 10 20:48:22 2016
@@ -18,9 +18,11 @@
*/
package org.apache.axiom.om.impl.mixin;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMInformationItem;
+import org.apache.axiom.om.impl.common.AxiomExceptionTranslator;
import org.apache.axiom.om.impl.common.AxiomSemantics;
import org.apache.axiom.om.impl.intf.AxiomInformationItem;
@@ -30,6 +32,10 @@ public aspect AxiomInformationItemSuppor
}
public final OMInformationItem AxiomInformationItem.clone(OMCloneOptions options) {
- return (OMInformationItem)coreClone(AxiomSemantics.CLONE_POLICY, options);
+ try {
+ return (OMInformationItem)coreClone(AxiomSemantics.CLONE_POLICY, options);
+ } catch (CoreModelException ex) {
+ throw AxiomExceptionTranslator.translate(ex);
+ }
}
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomNamespaceDeclarationSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomNamespaceDeclarationSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomNamespaceDeclarationSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomNamespaceDeclarationSupport.aj Wed Feb 10 20:48:22 2016
@@ -18,7 +18,9 @@
*/
package org.apache.axiom.om.impl.mixin;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.impl.common.AxiomExceptionTranslator;
import org.apache.axiom.om.impl.common.AxiomSemantics;
import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.intf.AxiomNamespaceDeclaration;
@@ -31,11 +33,15 @@ public aspect AxiomNamespaceDeclarationS
}
public final OMNamespace AxiomNamespaceDeclaration.getDeclaredNamespace() {
- String namespaceURI = coreGetCharacterData().toString();
- if (!namespaceURI.equals(declaredNamespace.getNamespaceURI())) {
- declaredNamespace = new OMNamespaceImpl(namespaceURI, declaredNamespace.getPrefix());
+ try {
+ String namespaceURI = coreGetCharacterData().toString();
+ if (!namespaceURI.equals(declaredNamespace.getNamespaceURI())) {
+ declaredNamespace = new OMNamespaceImpl(namespaceURI, declaredNamespace.getPrefix());
+ }
+ return declaredNamespace;
+ } catch (CoreModelException ex) {
+ throw AxiomExceptionTranslator.translate(ex);
}
- return declaredNamespace;
}
public final void AxiomNamespaceDeclaration.coreSetDeclaredNamespace(String prefix, String namespaceURI) {
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionSupport.aj Wed Feb 10 20:48:22 2016
@@ -18,7 +18,9 @@
*/
package org.apache.axiom.om.impl.mixin;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.om.OMOutputFormat;
+import org.apache.axiom.om.impl.common.AxiomExceptionTranslator;
import org.apache.axiom.om.impl.common.AxiomSemantics;
import org.apache.axiom.om.impl.intf.AxiomProcessingInstruction;
import org.apache.axiom.om.impl.stream.StreamException;
@@ -34,7 +36,11 @@ public aspect AxiomProcessingInstruction
}
public final String AxiomProcessingInstruction.getValue() {
- return coreGetCharacterData().toString();
+ try {
+ return coreGetCharacterData().toString();
+ } catch (CoreModelException ex) {
+ throw AxiomExceptionTranslator.translate(ex);
+ }
}
public final void AxiomProcessingInstruction.setValue(String value) {
@@ -42,7 +48,11 @@ public aspect AxiomProcessingInstruction
}
public final void AxiomProcessingInstruction.internalSerialize(XmlHandler handler, OMOutputFormat format, boolean cache) throws StreamException {
- handler.processProcessingInstruction(coreGetTarget() + " ", coreGetCharacterData().toString());
+ try {
+ handler.processProcessingInstruction(coreGetTarget() + " ", coreGetCharacterData().toString());
+ } catch (CoreModelException ex) {
+ throw AxiomExceptionTranslator.translate(ex);
+ }
}
public final void AxiomProcessingInstruction.buildWithAttachments() {
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomTextSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomTextSupport.aj?rev=1729724&r1=1729723&r2=1729724&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomTextSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomTextSupport.aj Wed Feb 10 20:48:22 2016
@@ -21,9 +21,11 @@ package org.apache.axiom.om.impl.mixin;
import javax.activation.DataHandler;
import javax.xml.namespace.QName;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.impl.common.AxiomExceptionTranslator;
import org.apache.axiom.om.impl.common.AxiomSemantics;
import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.intf.AxiomText;
@@ -31,15 +33,19 @@ import org.apache.axiom.om.impl.intf.Tex
public aspect AxiomTextSupport {
private TextContent AxiomText.getTextContent(boolean force) {
- Object content = coreGetCharacterData();
- if (content instanceof TextContent) {
- return (TextContent)content;
- } else if (force) {
- TextContent textContent = new TextContent((String)content);
- coreSetCharacterData(textContent, AxiomSemantics.INSTANCE);
- return textContent;
- } else {
- return null;
+ try {
+ Object content = coreGetCharacterData();
+ if (content instanceof TextContent) {
+ return (TextContent)content;
+ } else if (force) {
+ TextContent textContent = new TextContent((String)content);
+ coreSetCharacterData(textContent, AxiomSemantics.INSTANCE);
+ return textContent;
+ } else {
+ return null;
+ }
+ } catch (CoreModelException ex) {
+ throw AxiomExceptionTranslator.translate(ex);
}
}
@@ -68,15 +74,23 @@ public aspect AxiomTextSupport {
}
public final String AxiomText.getText() throws OMException {
- return coreGetCharacterData().toString();
+ try {
+ return coreGetCharacterData().toString();
+ } catch (CoreModelException ex) {
+ throw AxiomExceptionTranslator.translate(ex);
+ }
}
public final char[] AxiomText.getTextCharacters() {
- Object content = coreGetCharacterData();
- if (content instanceof TextContent) {
- return ((TextContent)content).toCharArray();
- } else {
- return ((String)content).toCharArray();
+ try {
+ Object content = coreGetCharacterData();
+ if (content instanceof TextContent) {
+ return ((TextContent)content).toCharArray();
+ } else {
+ return ((String)content).toCharArray();
+ }
+ } catch (CoreModelException ex) {
+ throw AxiomExceptionTranslator.translate(ex);
}
}
@@ -100,11 +114,15 @@ public aspect AxiomTextSupport {
}
public final DataHandler AxiomText.getDataHandler() {
- Object content = coreGetCharacterData();
- if (content instanceof TextContent) {
- return ((TextContent)content).getDataHandler();
- } else {
- throw new OMException("No DataHandler available");
+ try {
+ Object content = coreGetCharacterData();
+ if (content instanceof TextContent) {
+ return ((TextContent)content).getDataHandler();
+ } else {
+ throw new OMException("No DataHandler available");
+ }
+ } catch (CoreModelException ex) {
+ throw AxiomExceptionTranslator.translate(ex);
}
}
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=1729724&r1=1729723&r2=1729724&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 Wed Feb 10 20:48:22 2016
@@ -50,28 +50,31 @@ public abstract class ParentNode extends
}
private void checkNewChild(Node newChild, Node replacedChild) {
- NodeImpl newDomChild = (NodeImpl) newChild;
-
- checkSameOwnerDocument(newDomChild);
-
- if (isAncestorOrSelf(newChild)) {
- throw newDOMException(DOMException.HIERARCHY_REQUEST_ERR);
- }
-
- if (this instanceof Document) {
- if (newDomChild instanceof ElementImpl) {
- if (!(replacedChild instanceof Element) && ((DocumentImpl) this).coreGetDocumentElement() != null) {
- // Throw exception since there cannot be two document elements
+ try {
+ NodeImpl newDomChild = (NodeImpl) newChild;
+
+ checkSameOwnerDocument(newDomChild);
+
+ if (isAncestorOrSelf(newChild)) {
+ throw newDOMException(DOMException.HIERARCHY_REQUEST_ERR);
+ }
+
+ if (this instanceof Document) {
+ if (newDomChild instanceof ElementImpl) {
+ if (!(replacedChild instanceof Element) && ((DocumentImpl) this).coreGetDocumentElement() != null) {
+ // Throw exception since there cannot be two document elements
+ throw newDOMException(DOMException.HIERARCHY_REQUEST_ERR);
+ }
+ } else if (!(newDomChild instanceof CommentImpl
+ || newDomChild instanceof ProcessingInstructionImpl
+ || newDomChild instanceof DocumentFragmentImpl
+ || newDomChild instanceof DocumentTypeImpl)) {
throw newDOMException(DOMException.HIERARCHY_REQUEST_ERR);
}
- } else if (!(newDomChild instanceof CommentImpl
- || newDomChild instanceof ProcessingInstructionImpl
- || newDomChild instanceof DocumentFragmentImpl
- || newDomChild instanceof DocumentTypeImpl)) {
- throw newDOMException(DOMException.HIERARCHY_REQUEST_ERR);
}
+ } catch (CoreModelException ex) {
+ throw DOMExceptionUtil.toUncheckedException(ex);
}
-
}
/**