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 2014/07/26 14:41:28 UTC
svn commit: r1613614 - in /webservices/axiom/trunk:
aspects/core-aspects/src/main/java/org/apache/axiom/core/
aspects/dom-aspects/src/main/java/org/apache/axiom/dom/
implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/
Author: veithen
Date: Sat Jul 26 12:41:27 2014
New Revision: 1613614
URL: http://svn.apache.org/r1613614
Log:
Move some DOM code to aspects.
Added:
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj (with props)
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragment.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragment.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragment.java?rev=1613614&r1=1613613&r2=1613614&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragment.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragment.java Sat Jul 26 12:41:27 2014
@@ -18,6 +18,6 @@
*/
package org.apache.axiom.core;
-public interface CoreDocumentFragment extends CoreParentNode {
+public interface CoreDocumentFragment extends NonDeferringParentNode {
}
Added: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj?rev=1613614&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj (added)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj Sat Jul 26 12:41:27 2014
@@ -0,0 +1,54 @@
+/*
+ * 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.dom;
+
+import static org.apache.axiom.dom.DOMExceptionUtil.newDOMException;
+
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Node;
+
+public aspect DOMDocumentFragmentSupport {
+ public final short DOMDocumentFragment.getNodeType() {
+ return Node.DOCUMENT_FRAGMENT_NODE;
+ }
+
+ public final String DOMDocumentFragment.getNodeName() {
+ return "#document-fragment";
+ }
+
+ public final String DOMDocumentFragment.lookupNamespaceURI(String specifiedPrefix) {
+ return null;
+ }
+
+ public final String DOMDocumentFragment.lookupPrefix(String namespaceURI) {
+ return null;
+ }
+
+ public final String DOMDocumentFragment.getPrefix() {
+ return null;
+ }
+
+ public final void DOMDocumentFragment.setPrefix(String prefix) throws DOMException {
+ throw newDOMException(DOMException.NAMESPACE_ERR);
+ }
+
+ public final String DOMDocumentFragment.getLocalName() {
+ return null;
+ }
+}
Propchange: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java?rev=1613614&r1=1613613&r2=1613614&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java Sat Jul 26 12:41:27 2014
@@ -19,47 +19,23 @@
package org.apache.axiom.om.impl.dom;
-import static org.apache.axiom.dom.DOMExceptionUtil.newDOMException;
-
-import org.apache.axiom.core.NonDeferringParentNode;
import org.apache.axiom.dom.DOMDocumentFragment;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.impl.common.serializer.push.Serializer;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Node;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
-public class DocumentFragmentImpl extends RootNode implements
- DOMDocumentFragment, NonDeferringParentNode {
+public class DocumentFragmentImpl extends RootNode implements DOMDocumentFragment {
/** @param ownerDocument */
public DocumentFragmentImpl(OMFactory factory) {
super(factory);
}
- /*
- * (non-Javadoc)
- *
- * @see org.w3c.dom.Node#getNodeType()
- */
- public short getNodeType() {
- return Node.DOCUMENT_FRAGMENT_NODE;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.w3c.dom.Node#getNodeName()
- */
- public String getNodeName() {
- return "#document-fragment";
- }
-
public void internalSerialize(Serializer serializer, OMOutputFormat format, boolean cache) {
// TODO
throw new UnsupportedOperationException("TODO");
@@ -84,26 +60,6 @@ public class DocumentFragmentImpl extend
// A document fragment doesn't have a builder
}
- public final String lookupNamespaceURI(String specifiedPrefix) {
- return null;
- }
-
- public String lookupPrefix(String namespaceURI) {
- return null;
- }
-
public final void checkChild(OMNode child) {
}
-
- public final String getPrefix() {
- return null;
- }
-
- public final void setPrefix(String prefix) throws DOMException {
- throw newDOMException(DOMException.NAMESPACE_ERR);
- }
-
- public final String getLocalName() {
- return null;
- }
}