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/18 21:16:29 UTC
svn commit: r1611775 - in /webservices/axiom/trunk:
aspects/dom-aspects/src/main/java/org/apache/axiom/dom/
implementations/dom/src/main/java/org/apache/axiom/dom/impl/
modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/
Author: veithen
Date: Fri Jul 18 19:16:28 2014
New Revision: 1611775
URL: http://svn.apache.org/r1611775
Log:
Moved some code from DOOM to the shared DOM aspects.
Added:
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMConfigurationImpl.java
- copied, changed from r1611509, webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMConfigurationImpl.java
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNodeSupport.aj (with props)
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMParentNode.java (with props)
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMParentNodeSupport.aj (with props)
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMRootNode.java (with props)
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMRootNodeSupport.aj (with props)
Removed:
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMConfigurationImpl.java
Modified:
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocument.java
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragment.java
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElement.java
webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/RootNode.java
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/RootNode.java
Copied: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMConfigurationImpl.java (from r1611509, webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMConfigurationImpl.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMConfigurationImpl.java?p2=webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMConfigurationImpl.java&p1=webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMConfigurationImpl.java&r1=1611509&r2=1611775&rev=1611775&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMConfigurationImpl.java (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMConfigurationImpl.java Fri Jul 18 19:16:28 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.om.impl.dom;
+package org.apache.axiom.dom;
import java.util.HashMap;
import java.util.Map;
@@ -25,7 +25,8 @@ import org.w3c.dom.DOMConfiguration;
import org.w3c.dom.DOMException;
import org.w3c.dom.DOMStringList;
-public class DOMConfigurationImpl implements DOMConfiguration {
+// TODO: should eventually have package access
+public final class DOMConfigurationImpl implements DOMConfiguration {
private static final String CANONICAL_FORM_PARAM = "canonical-form";
private static final String CDATA_SECTIONS_PARAM ="cdata-sections";
private static final String CHECK_CHAR_NORMALIZATION_PARAM = "check-character-normalization";
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocument.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocument.java?rev=1611775&r1=1611774&r2=1611775&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocument.java (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocument.java Fri Jul 18 19:16:28 2014
@@ -21,6 +21,6 @@ package org.apache.axiom.dom;
import org.apache.axiom.core.CoreDocument;
import org.w3c.dom.Document;
-public interface DOMDocument extends Document, CoreDocument {
+public interface DOMDocument extends DOMRootNode, Document, CoreDocument {
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragment.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragment.java?rev=1611775&r1=1611774&r2=1611775&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragment.java (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragment.java Fri Jul 18 19:16:28 2014
@@ -21,6 +21,6 @@ package org.apache.axiom.dom;
import org.apache.axiom.core.CoreDocumentFragment;
import org.w3c.dom.DocumentFragment;
-public interface DOMDocumentFragment extends DocumentFragment, CoreDocumentFragment {
+public interface DOMDocumentFragment extends DOMRootNode, DocumentFragment, CoreDocumentFragment {
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj?rev=1611775&r1=1611774&r2=1611775&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj Fri Jul 18 19:16:28 2014
@@ -18,10 +18,13 @@
*/
package org.apache.axiom.dom;
+import org.w3c.dom.DOMConfiguration;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
public aspect DOMDocumentSupport {
+ private final DOMConfigurationImpl DOMDocument.domConfig = new DOMConfigurationImpl();
+
public final String DOMDocument.getNodeName() {
return "#document";
}
@@ -49,4 +52,17 @@ public aspect DOMDocumentSupport {
return documentElement == null ? null
: getDocumentElement().lookupPrefix(namespaceURI);
}
+
+ public final DOMConfiguration DOMDocument.getDomConfig() {
+ return domConfig;
+ }
+
+ public final void DOMDocument.normalizeDocument() {
+ if (domConfig.isEnabled(DOMConfigurationImpl.SPLIT_CDATA_SECTIONS)
+ || domConfig.isEnabled(DOMConfigurationImpl.WELLFORMED)) {
+ throw new UnsupportedOperationException("TODO");
+ } else {
+ normalize(domConfig);
+ }
+ }
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElement.java?rev=1611775&r1=1611774&r2=1611775&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElement.java (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElement.java Fri Jul 18 19:16:28 2014
@@ -21,6 +21,6 @@ package org.apache.axiom.dom;
import org.apache.axiom.core.CoreElement;
import org.w3c.dom.Element;
-public interface DOMElement extends DOMChildNode, Element, CoreElement {
+public interface DOMElement extends DOMChildNode, DOMParentNode, Element, CoreElement {
}
Added: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNodeSupport.aj?rev=1611775&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNodeSupport.aj (added)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNodeSupport.aj Fri Jul 18 19:16:28 2014
@@ -0,0 +1,26 @@
+/*
+ * 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;
+
+public aspect DOMNodeSupport {
+ // TODO: should eventually have package access
+ public void DOMNode.normalize(DOMConfigurationImpl config) {
+ // Default: do nothing
+ }
+}
Propchange: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNodeSupport.aj
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMParentNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMParentNode.java?rev=1611775&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMParentNode.java (added)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMParentNode.java Fri Jul 18 19:16:28 2014
@@ -0,0 +1,25 @@
+/*
+ * 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 org.apache.axiom.core.CoreParentNode;
+
+public interface DOMParentNode extends DOMNode, CoreParentNode {
+
+}
Propchange: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMParentNode.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMParentNodeSupport.aj?rev=1611775&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMParentNodeSupport.aj (added)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMParentNodeSupport.aj Fri Jul 18 19:16:28 2014
@@ -0,0 +1,31 @@
+/*
+ * 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 org.apache.axiom.core.CoreChildNode;
+
+public aspect DOMParentNodeSupport {
+ public void DOMParentNode.normalize(DOMConfigurationImpl config) {
+ CoreChildNode child = coreGetFirstChild();
+ while (child != null) {
+ ((DOMNode)child).normalize(config);
+ child = child.coreGetNextSibling();
+ }
+ }
+}
Propchange: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMParentNodeSupport.aj
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMRootNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMRootNode.java?rev=1611775&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMRootNode.java (added)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMRootNode.java Fri Jul 18 19:16:28 2014
@@ -0,0 +1,23 @@
+/*
+ * 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;
+
+public interface DOMRootNode extends DOMParentNode {
+
+}
Propchange: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMRootNode.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMRootNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMRootNodeSupport.aj?rev=1611775&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMRootNodeSupport.aj (added)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMRootNodeSupport.aj Fri Jul 18 19:16:28 2014
@@ -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.dom;
+
+import org.w3c.dom.Node;
+
+public aspect DOMRootNodeSupport {
+ public final Node DOMRootNode.getNextSibling() {
+ return null;
+ }
+
+ public final Node DOMRootNode.getPreviousSibling() {
+ return null;
+ }
+
+ public final Node DOMRootNode.getParentNode() {
+ return null;
+ }
+}
Propchange: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMRootNodeSupport.aj
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/RootNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/RootNode.java?rev=1611775&r1=1611774&r2=1611775&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/RootNode.java (original)
+++ webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/RootNode.java Fri Jul 18 19:16:28 2014
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.dom.impl;
-abstract class RootNode extends NodeImpl {
+import org.apache.axiom.dom.DOMRootNode;
+
+abstract class RootNode extends NodeImpl implements DOMRootNode {
}
Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java?rev=1611775&r1=1611774&r2=1611775&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java Fri Jul 18 19:16:28 2014
@@ -41,7 +41,6 @@ import org.apache.axiom.om.impl.common.s
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
import org.w3c.dom.Comment;
-import org.w3c.dom.DOMConfiguration;
import org.w3c.dom.DOMException;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
@@ -76,8 +75,6 @@ public class DocumentImpl extends RootNo
protected Hashtable identifiers;
- private final DOMConfigurationImpl domConfig = new DOMConfigurationImpl();
-
public DocumentImpl(OMXMLParserWrapper parserWrapper, OMFactory factory) {
super(factory);
coreSetBuilder(parserWrapper);
@@ -470,10 +467,6 @@ public class DocumentImpl extends RootNo
throw new UnsupportedOperationException("TODO");
}
- public DOMConfiguration getDomConfig() {
- return domConfig;
- }
-
public String getInputEncoding() {
return charEncoding;
}
@@ -495,15 +488,6 @@ public class DocumentImpl extends RootNo
return getXMLVersion();
}
- public void normalizeDocument() {
- if (domConfig.isEnabled(DOMConfigurationImpl.SPLIT_CDATA_SECTIONS)
- || domConfig.isEnabled(DOMConfigurationImpl.WELLFORMED)) {
- throw new UnsupportedOperationException("TODO");
- } else {
- normalize(domConfig);
- }
- }
-
public Node renameNode(Node node, String namespaceURI, String qualifiedName)
throws DOMException {
// TODO TODO
Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java?rev=1611775&r1=1611774&r2=1611775&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java Fri Jul 18 19:16:28 2014
@@ -20,6 +20,7 @@
package org.apache.axiom.om.impl.dom;
import org.apache.axiom.core.CoreChildNode;
+import org.apache.axiom.dom.DOMConfigurationImpl;
import org.apache.axiom.dom.DOMElement;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMCloneOptions;
@@ -888,7 +889,7 @@ public class ElementImpl extends ParentN
}
}
- void normalize(DOMConfigurationImpl config) {
+ public void normalize(DOMConfigurationImpl config) {
if (config.isEnabled(DOMConfigurationImpl.NAMESPACES)) {
OMNamespace namespace = getNamespace();
if (namespace == null) {
Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java?rev=1611775&r1=1611774&r2=1611775&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java Fri Jul 18 19:16:28 2014
@@ -68,10 +68,6 @@ public abstract class NodeImpl extends I
this.factory = factory;
}
- void normalize(DOMConfigurationImpl config) {
- // Default: do nothing
- }
-
public void normalize() {
//Parent node should override this
}
Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java?rev=1611775&r1=1611774&r2=1611775&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java Fri Jul 18 19:16:28 2014
@@ -20,7 +20,7 @@
package org.apache.axiom.om.impl.dom;
import org.apache.axiom.core.CoreChildNode;
-import org.apache.axiom.core.CoreParentNode;
+import org.apache.axiom.dom.DOMParentNode;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMSourcedElement;
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-public abstract class ParentNode extends NodeImpl implements NodeList, CoreParentNode {
+public abstract class ParentNode extends NodeImpl implements NodeList, DOMParentNode {
protected ParentNode(OMFactory factory) {
super(factory);
}
@@ -409,12 +409,4 @@ public abstract class ParentNode extends
insertBefore((NodeImpl)getOMFactory().createOMText(textContent), null, false);
}
}
-
- void normalize(DOMConfigurationImpl config) {
- CoreChildNode child = coreGetFirstChild();
- while (child != null) {
- ((NodeImpl)child).normalize(config);
- child = child.coreGetNextSibling();
- }
- }
}
Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/RootNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/RootNode.java?rev=1611775&r1=1611774&r2=1611775&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/RootNode.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/RootNode.java Fri Jul 18 19:16:28 2014
@@ -18,10 +18,10 @@
*/
package org.apache.axiom.om.impl.dom;
+import org.apache.axiom.dom.DOMRootNode;
import org.apache.axiom.om.OMFactory;
-import org.w3c.dom.Node;
-public abstract class RootNode extends ParentNode {
+public abstract class RootNode extends ParentNode implements DOMRootNode {
public RootNode(OMFactory factory) {
super(factory);
}
@@ -41,16 +41,4 @@ public abstract class RootNode extends P
final void internalSetNextSibling(NodeImpl nextSibling) {
throw new UnsupportedOperationException();
}
-
- public final Node getNextSibling() {
- return null;
- }
-
- public final Node getPreviousSibling() {
- return null;
- }
-
- public final Node getParentNode() {
- return null;
- }
}