ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1798326 - in /webservices/axiom/trunk/aspects: core-aspects/src/main/java/org/apache/axiom/core/ core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/ om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/
Date Sat, 10 Jun 2017 15:26:11 GMT
Author: veithen
Date: Sat Jun 10 15:26:10 2017
New Revision: 1798326

URL: http://svn.apache.org/viewvc?rev=1798326&view=rev
Log:
Ensure consistency of core model interfaces.

Modified:
    webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttribute.java
    webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataNode.java
    webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNode.java
    webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocument.java
    webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentTypeDeclaration.java
    webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElement.java
    webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreEntityReference.java
    webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreMixedContentContainer.java
    webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNSAwareElement.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/CoreParentNode.java
    webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreProcessingInstruction.java
    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/CoreDocumentTypeDeclarationSupport.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/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocTypeSupport.aj

Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttribute.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttribute.java?rev=1798326&r1=1798325&r2=1798326&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttribute.java
(original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttribute.java
Sat Jun 10 15:26:10 2017
@@ -18,6 +18,8 @@
  */
 package org.apache.axiom.core;
 
+import org.apache.axiom.core.impl.Flags;
+
 public interface CoreAttribute extends CoreCharacterDataContainingParentNode {
     /**
      * Get the owner element of this attribute.
@@ -59,4 +61,8 @@ public interface CoreAttribute extends C
      *         of its owner element or if the attribute has no owner element
      */
     CoreAttribute coreGetPreviousAttribute();
+
+    boolean coreGetSpecified();
+
+    void coreSetSpecified(boolean specified);
 }

Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataNode.java?rev=1798326&r1=1798325&r2=1798326&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataNode.java
(original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataNode.java
Sat Jun 10 15:26:10 2017
@@ -19,6 +19,9 @@
 package org.apache.axiom.core;
 
 public interface CoreCharacterDataNode extends CoreLeafNode, CoreCharacterDataContainer {
+    @Override
+    Object coreGetCharacterData();
+
     void coreSetCharacterData(Object data);
     
     /**

Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNode.java?rev=1798326&r1=1798325&r2=1798326&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNode.java
(original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNode.java
Sat Jun 10 15:26:10 2017
@@ -20,6 +20,20 @@ package org.apache.axiom.core;
 
 public interface CoreChildNode extends CoreNode {
     /**
+     * Check if this node has a parent.
+     * 
+     * @return <code>true</code> if and only if this node currently has a parent
+     */
+    boolean coreHasParent();
+    
+    /**
+     * Get the parent of this node.
+     * 
+     * @return the parent of this node or <code>null</code> if this node doesn't
have a parent
+     */
+    CoreParentNode coreGetParent();
+    
+    /**
      * Get the parent element of this node.
      * 
      * @return the parent element of this node or <code>null</code> if the node
has no parent or if
@@ -27,7 +41,11 @@ public interface CoreChildNode extends C
      */
     CoreElement coreGetParentElement();
 
-    CoreChildNode coreGetNextSibling();
+    CoreChildNode coreGetNextSibling() throws CoreModelException;
+    CoreChildNode coreGetPreviousSibling();
+
+    CoreChildNode coreGetNextSibling(NodeFilter filter) throws CoreModelException;
+    CoreChildNode coreGetPreviousSibling(NodeFilter filter);
 
     /**
      * Get the next sibling if it is available. The sibling is available if it is complete
or if the
@@ -39,7 +57,15 @@ public interface CoreChildNode extends C
      */
     CoreChildNode coreGetNextSiblingIfAvailable();
 
+    void coreInsertSiblingAfter(CoreChildNode sibling) throws CoreModelException;
+    void coreInsertSiblingBefore(CoreChildNode sibling) throws CoreModelException;
+    
+    void coreInsertSiblingsBefore(CoreDocumentFragment fragment);
+    
     void coreDetach(Semantics semantics);
+    void coreDetach(CoreDocument newOwnerDocument);
+
+    void coreReplaceWith(CoreChildNode newNode, Semantics semantics) throws CoreModelException;
 
     /**
      * Clone this node according to the provided policy.
@@ -50,5 +76,5 @@ public interface CoreChildNode extends C
      *            the node to which the clone should be added; may be <code>null</code>
      * @return the clone of this node
      */
-    <T> CoreNode coreClone(ClonePolicy<T> policy, T options, CoreParentNode targetParent);
+    <T> CoreNode coreClone(ClonePolicy<T> policy, T options, CoreParentNode targetParent)
throws CoreModelException;
 }

Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocument.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocument.java?rev=1798326&r1=1798325&r2=1798326&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocument.java
(original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocument.java
Sat Jun 10 15:26:10 2017
@@ -19,5 +19,14 @@
 package org.apache.axiom.core;
 
 public interface CoreDocument extends CoreParentNode {
-
+    String coreGetInputEncoding();
+    void coreSetInputEncoding(String inputEncoding);
+    String coreGetXmlVersion();
+    void coreSetXmlVersion(String xmlVersion);
+    String coreGetXmlEncoding();
+    void coreSetXmlEncoding(String xmlEncoding);
+    Boolean coreGetStandalone();
+    void coreSetStandalone(Boolean standalone);
+    
+    CoreElement coreGetDocumentElement() throws CoreModelException;
 }

Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentTypeDeclaration.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentTypeDeclaration.java?rev=1798326&r1=1798325&r2=1798326&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentTypeDeclaration.java
(original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentTypeDeclaration.java
Sat Jun 10 15:26:10 2017
@@ -19,5 +19,12 @@
 package org.apache.axiom.core;
 
 public interface CoreDocumentTypeDeclaration extends CoreLeafNode {
-
+    String coreGetRootName();
+    void coreSetRootName(String rootName);
+    String coreGetPublicId();
+    void coreSetPublicId(String publicId);
+    String coreGetSystemId();
+    void coreSetSystemId(String systemId);
+    String coreGetInternalSubset();
+    void coreSetInternalSubset(String internalSubset);
 }

Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElement.java?rev=1798326&r1=1798325&r2=1798326&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElement.java
(original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElement.java
Sat Jun 10 15:26:10 2017
@@ -73,7 +73,7 @@ public interface CoreElement extends Cor
      *            {@link AttributeMatcher#createAttribute(CoreElement, String, String, String,
String)}
      *            and {@link AttributeMatcher#update(CoreAttribute, String, String)}
      */
-    void coreSetAttribute(AttributeMatcher matcher, String namespaceURI, String name, String
prefix, String value);
+    void coreSetAttribute(AttributeMatcher matcher, String namespaceURI, String name, String
prefix, String value) throws CoreModelException;
     
     /**
      * Add a new attribute or replace an existing attribute based on a given
@@ -134,7 +134,7 @@ public interface CoreElement extends Cor
      *         returned
      * @see Semantics#isUseStrictNamespaceLookup()
      */
-    String coreLookupNamespaceURI(String prefix, Semantics semantics);
+    String coreLookupNamespaceURI(String prefix, Semantics semantics) throws CoreModelException;
     
     /**
      * Find a prefix associated to the given namespace URI. Default namespaces are not taken
into
@@ -152,5 +152,7 @@ public interface CoreElement extends Cor
      */
     // TODO: wrong Javadoc: null vs. empty string
     // TODO: we can support default namespaces!
-    String coreLookupPrefix(String namespaceURI, Semantics semantics);
+    String coreLookupPrefix(String namespaceURI, Semantics semantics) throws CoreModelException;
+    
+    <T extends CoreElement> T corePromote(Class<T> type, Semantics semantics)
throws CoreModelException;
 }

Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreEntityReference.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreEntityReference.java?rev=1798326&r1=1798325&r2=1798326&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreEntityReference.java
(original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreEntityReference.java
Sat Jun 10 15:26:10 2017
@@ -19,5 +19,8 @@
 package org.apache.axiom.core;
 
 public interface CoreEntityReference extends CoreLeafNode {
-
+    String coreGetName();
+    void coreSetName(String name);
+    String coreGetReplacementText();
+    void coreSetReplacementText(String replacementText);
 }

Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreMixedContentContainer.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreMixedContentContainer.java?rev=1798326&r1=1798325&r2=1798326&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreMixedContentContainer.java
(original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreMixedContentContainer.java
Sat Jun 10 15:26:10 2017
@@ -19,5 +19,5 @@
 package org.apache.axiom.core;
 
 public interface CoreMixedContentContainer extends CoreParentNode, CoreCharacterDataSinkNode
{
-    Object coreGetCharacterData(ElementAction elementAction);
+    Object coreGetCharacterData(ElementAction elementAction) throws CoreModelException;
 }

Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNSAwareElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNSAwareElement.java?rev=1798326&r1=1798325&r2=1798326&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNSAwareElement.java
(original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNSAwareElement.java
Sat Jun 10 15:26:10 2017
@@ -18,6 +18,10 @@
  */
 package org.apache.axiom.core;
 
-public interface CoreNSAwareElement extends CoreElement, CoreNSAwareNamedNode {
+import org.apache.axiom.core.stream.StreamException;
+import org.apache.axiom.core.stream.XmlInput;
 
+public interface CoreNSAwareElement extends CoreElement, CoreNSAwareNamedNode {
+    XmlInput getXmlInput(boolean cache, boolean incremental) throws StreamException;
+    void validateName(String staxPrefix, String staxLocalName, String staxNamespaceURI);
 }

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=1798326&r1=1798325&r2=1798326&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
Sat Jun 10 15:26:10 2017
@@ -22,6 +22,21 @@ import org.apache.axiom.core.stream.Stre
 import org.apache.axiom.core.stream.XmlHandler;
 
 public interface CoreNode {
+    /**
+     * Get the owner document to which this node belongs.
+     * 
+     * @param create
+     *            indicates whether the owner document should be created if it has not been
created
+     *            yet
+     * @return the owner document or <code>null</code> if the owner document
has not been created
+     *         yet and <code>create</code> is <code>false</code>
+     */
+    CoreDocument coreGetOwnerDocument(boolean create);
+    
+    CoreNode getRootOrOwnerDocument();
+    
+    boolean coreHasSameOwnerDocument(CoreNode other);
+    
     void coreSetOwnerDocument(CoreDocument document);
     
     NodeFactory coreGetNodeFactory();

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=1798326&r1=1798325&r2=1798326&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 Jun 10 15:26:10 2017
@@ -18,6 +18,10 @@
  */
 package org.apache.axiom.core;
 
+import org.apache.axiom.core.stream.StreamException;
+import org.apache.axiom.core.stream.XmlHandler;
+import org.apache.axiom.core.stream.XmlReader;
+
 /**
  * Interface for parent nodes.
  */
@@ -43,10 +47,45 @@ public interface CoreParentNode extends
     InputContext coreGetInputContext();
     void coreSetInputContext(InputContext context);
     int getState();
+    boolean isExpanded();
+    void forceExpand();
     void coreSetState(int state);
     void coreBuild() throws CoreModelException;
 
+    void serializeStartEvent(XmlHandler handler) throws CoreModelException, StreamException;
+    void serializeEndEvent(XmlHandler handler) throws StreamException;
+    void internalAppendChildWithoutBuild(CoreChildNode child);
+
+    /**
+     * Get the first child if it is available. The child is available if it is complete or
+     * if the builder has started building the node. In the latter case,
+     * {@link OMNode#isComplete()} may return <code>false</code> when called
on the child. 
+     * In contrast to {@link OMContainer#getFirstOMChild()}, this method will never modify
+     * the state of the underlying parser.
+     * 
+     * @return the first child or <code>null</code> if the container has no children
or
+     *         the builder has not yet started to build the first child
+     */
+    CoreChildNode coreGetFirstChildIfAvailable();
+    
+    CoreChildNode coreGetFirstChild() throws CoreModelException;
+    CoreChildNode coreGetFirstChild(NodeFilter filter) throws CoreModelException;
+    
+    CoreChildNode coreGetLastChild() throws CoreModelException;
+    CoreChildNode coreGetLastChild(NodeFilter filter) throws CoreModelException;
+    
+    void coreAppendChild(CoreChildNode child) throws CoreModelException;
+    void coreAppendChildren(CoreDocumentFragment fragment) throws CoreModelException;
+    
+    XmlReader coreGetReader(XmlHandler handler, boolean cache, boolean incremental);
+    
     <T extends CoreNode,S> NodeIterator<S> coreGetNodes(Axis axis, Class<T>
type, Mapper<S,? super T> mapper, Semantics semantics);
 
     <T extends CoreElement,S> NodeIterator<S> coreGetElements(Axis axis, Class<T>
type, ElementMatcher<? super T> matcher, String namespaceURI, String name, Mapper<S,?
super T> mapper, Semantics semantics);
+    
+    void coreSetCharacterData(Object data, Semantics semantics) throws CoreModelException;
+    
+    void coreRemoveChildren(Semantics semantics) throws CoreModelException;
+    
+    void coreDiscard(boolean consumeInput) throws CoreModelException;
 }

Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreProcessingInstruction.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreProcessingInstruction.java?rev=1798326&r1=1798325&r2=1798326&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreProcessingInstruction.java
(original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreProcessingInstruction.java
Sat Jun 10 15:26:10 2017
@@ -19,5 +19,7 @@
 package org.apache.axiom.core;
 
 public interface CoreProcessingInstruction extends CoreChildNode, CoreCharacterDataContainingParentNode
{
-
+    String coreGetTarget();
+    
+    void coreSetTarget(String target);
 }

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=1798326&r1=1798325&r2=1798326&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
Sat Jun 10 15:26:10 2017
@@ -40,20 +40,10 @@ public aspect CoreChildNodeSupport {
     CoreChildNode CoreChildNode.nextSibling;
     CoreChildNode CoreChildNode.previousSibling;
     
-    /**
-     * Check if this node has a parent.
-     * 
-     * @return <code>true</code> if and only if this node currently has a parent
-     */
     public final boolean CoreChildNode.coreHasParent() {
         return getFlag(Flags.HAS_PARENT);
     }
     
-    /**
-     * Get the parent of this node.
-     * 
-     * @return the parent of this node or <code>null</code> if this node doesn't
have a parent
-     */
     public final CoreParentNode CoreChildNode.coreGetParent() {
         return getFlag(Flags.HAS_PARENT) ? owner : null;
     }

Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentTypeDeclarationSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentTypeDeclarationSupport.aj?rev=1798326&r1=1798325&r2=1798326&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentTypeDeclarationSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentTypeDeclarationSupport.aj
Sat Jun 10 15:26:10 2017
@@ -20,6 +20,7 @@ package org.apache.axiom.core.impl.mixin
 
 import org.apache.axiom.core.ClonePolicy;
 import org.apache.axiom.core.CoreDocumentTypeDeclaration;
+import org.apache.axiom.core.CoreModelException;
 import org.apache.axiom.core.CoreNode;
 import org.apache.axiom.core.NodeType;
 import org.apache.axiom.core.stream.StreamException;
@@ -75,7 +76,7 @@ public aspect CoreDocumentTypeDeclaratio
         coreSetInternalSubset(o.coreGetInternalSubset());
     }
 
-    public final void CoreDocumentTypeDeclaration.internalSerialize(XmlHandler handler, boolean
cache) throws StreamException {
+    public final void CoreDocumentTypeDeclaration.internalSerialize(XmlHandler handler, boolean
cache) throws CoreModelException, StreamException {
         handler.processDocumentTypeDeclaration(coreGetRootName(), coreGetPublicId(), coreGetSystemId(),
coreGetInternalSubset());
     }
 }

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=1798326&r1=1798325&r2=1798326&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
Sat Jun 10 15:26:10 2017
@@ -42,17 +42,6 @@ public aspect CoreNodeSupport {
     public void CoreNode.updateFiliation(CoreNode creator) {
     }
     
-    public abstract CoreNode CoreNode.getRootOrOwnerDocument();
-
-    /**
-     * Get the owner document to which this node belongs.
-     * 
-     * @param create
-     *            indicates whether the owner document should be created if it has not been
created
-     *            yet
-     * @return the owner document or <code>null</code> if the owner document
has not been created
-     *         yet and <code>create</code> is <code>false</code>
-     */
     public final CoreDocument CoreNode.coreGetOwnerDocument(boolean create) {
         CoreNode root = getRootOrOwnerDocument();
         if (root instanceof CoreDocument) {

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=1798326&r1=1798325&r2=1798326&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
Sat Jun 10 15:26:10 2017
@@ -112,16 +112,6 @@ public aspect CoreParentNodeSupport {
         }
     }
     
-    /**
-     * Get the first child if it is available. The child is available if it is complete or
-     * if the builder has started building the node. In the latter case,
-     * {@link OMNode#isComplete()} may return <code>false</code> when called
on the child. 
-     * In contrast to {@link OMContainer#getFirstOMChild()}, this method will never modify
-     * the state of the underlying parser.
-     * 
-     * @return the first child or <code>null</code> if the container has no children
or
-     *         the builder has not yet started to build the first child
-     */
     public final CoreChildNode CoreParentNode.coreGetFirstChildIfAvailable() {
         forceExpand();
         Content content = getContent(false);

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocTypeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocTypeSupport.aj?rev=1798326&r1=1798325&r2=1798326&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocTypeSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocTypeSupport.aj
Sat Jun 10 15:26:10 2017
@@ -21,6 +21,7 @@ package org.apache.axiom.om.impl.mixin;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 
+import org.apache.axiom.core.CoreModelException;
 import org.apache.axiom.core.stream.StreamException;
 import org.apache.axiom.om.impl.common.AxiomExceptionTranslator;
 import org.apache.axiom.om.impl.intf.AxiomDocType;
@@ -38,6 +39,8 @@ public aspect AxiomDocTypeSupport {
     public final void AxiomDocType.serialize(XMLStreamWriter writer, boolean cache) throws
XMLStreamException {
         try {
             internalSerialize(new XMLStreamWriterHandler(writer), cache);
+        } catch (CoreModelException ex) {
+            throw AxiomExceptionTranslator.translate(ex);
         } catch (StreamException ex) {
             throw AxiomExceptionTranslator.toXMLStreamException(ex);
         }



Mime
View raw message