[140681] Can not use other providers of org.w3c.dom packages -- workaround, for Sun 1.4.2 JRE's
diff --git a/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF
index aa9b279..70aa6a5 100644
--- a/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF
@@ -59,7 +59,6 @@
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.wst.common.uriresolver,
- org.apache.xerces,
org.eclipse.wst.sse.core,
org.eclipse.text,
org.eclipse.jem.util;resolution:=optional,
@@ -69,5 +68,6 @@
org.eclipse.emf.ecore.xmi;resolution:=optional,
org.eclipse.wst.common.emfworkbench.integration;resolution:=optional,
org.eclipse.wst.common.core,
- com.ibm.icu
+ com.ibm.icu,
+ org.apache.xerces
Eclipse-LazyStart: true; exceptions="org.eclipse.wst.xml.core.internal.contenttype"
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentImpl.java
index f018118..0764337 100644
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentImpl.java
+++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentImpl.java
@@ -49,7 +49,9 @@
import org.w3c.dom.Notation;
import org.w3c.dom.ProcessingInstruction;
import org.w3c.dom.Text;
+import org.w3c.dom.ranges.DocumentRange;
import org.w3c.dom.ranges.Range;
+import org.w3c.dom.traversal.DocumentTraversal;
import org.w3c.dom.traversal.NodeFilter;
import org.w3c.dom.traversal.NodeIterator;
import org.w3c.dom.traversal.TreeWalker;
@@ -58,7 +60,7 @@
/**
* DocumentImpl class
*/
-public class DocumentImpl extends NodeContainer implements IDOMDocument {
+public class DocumentImpl extends NodeContainer implements IDOMDocument, DocumentRange, DocumentTraversal {
/**
* Internal-use only class. This class was added to better able to handle
@@ -468,16 +470,21 @@
/**
* Return an instance of tree walk
*/
- /* (non-Javadoc)
- * @see org.w3c.dom.traversal.DocumentTraversal#createTreeWalker(org.w3c.dom.Node, int, org.w3c.dom.traversal.NodeFilter, boolean)
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.w3c.dom.traversal.DocumentTraversal#createTreeWalker(org.w3c.dom.Node,
+ * int, org.w3c.dom.traversal.NodeFilter, boolean)
*/
public TreeWalker createTreeWalker(Node root, int whatToShow, NodeFilter filter, boolean entityReferenceExpansion) {
if (root == null) {
String msg = "Program Error: root node can not be null for TreeWalker";
throw new DOMException(DOMException.NOT_SUPPORTED_ERR, msg);
}
- //ISSUE: we just use Xerces implementation for now, but longer term, we should make a
- // thread/job safe version (as well as not rely on Xerces "impl" class.
+ // ISSUE: we just use Xerces implementation for now, but longer term,
+ // we should make a
+ // thread/job safe version (as well as not rely on Xerces "impl"
+ // class.
return new TreeWalkerImpl(root, whatToShow, filter, entityReferenceExpansion);
}
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeImpl.java
index 681fa6f..f5e6599 100644
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeImpl.java
+++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeImpl.java
@@ -37,7 +37,7 @@
/**
* NodeImpl class
*/
-public abstract class NodeImpl extends AbstractNotifier implements IDOMNode {
+public abstract class NodeImpl extends AbstractNotifier implements Node, IDOMNode {
// define one empty nodelist, for repeated use
private final static NodeList EMPTY_NODE_LIST = new NodeListImpl();
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMDocument.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMDocument.java
index 33c97c3..c9991fc 100644
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMDocument.java
+++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMDocument.java
@@ -18,8 +18,7 @@
import org.w3c.dom.Document;
import org.w3c.dom.DocumentType;
import org.w3c.dom.Element;
-import org.w3c.dom.ranges.DocumentRange;
-import org.w3c.dom.traversal.DocumentTraversal;
+import org.w3c.dom.Node;
/**
* This interface enables creation of DOCTYPE declaration and some DOM Level 2
@@ -27,7 +26,7 @@
*
* @plannedfor 1.0
*/
-public interface IDOMDocument extends IDOMNode, Document, DocumentRange, DocumentTraversal {
+public interface IDOMDocument extends Node, Document, IDOMNode {
/**
* create comment element. tagName must be registered as comment element
@@ -93,6 +92,7 @@
* ISSUE: need to specify -- currently used to denote an HTML DOM document
* is XHTML
*
+ * @deprecated
*
*/
boolean isXMLType();
diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMNode.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMNode.java
index c73891c..6389c29 100644
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMNode.java
+++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/document/IDOMNode.java
@@ -22,8 +22,6 @@
import org.eclipse.wst.xml.core.internal.document.InvalidCharacterException;
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
/**
* This interface describes the extended functionality of our source-oriented
@@ -266,15 +264,6 @@
*/
public void setTextContent(String textContent) throws DOMException;
- /**
- * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
- */
- public Object setUserData(String key, Object data, UserDataHandler handler);
-
- /**
- * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
- */
- public TypeInfo getSchemaTypeInfo();
/**
* NOT IMPLEMENTED, is defined here in preparation of DOM Level 3