mrglavas 2005/05/02 15:02:23
Modified: java/src/org/apache/xerces/dom AttrNSImpl.java
DOMConfigurationImpl.java DOMNormalizer.java
NodeImpl.java PSVIDocumentImpl.java
ElementImpl.java DocumentImpl.java
ElementNSImpl.java DocumentTypeImpl.java
DOMLocatorImpl.java
DOMImplementationSourceImpl.java DOMErrorImpl.java
ParentNode.java CoreDocumentImpl.java
DOMStringListImpl.java
DOMXSImplementationSourceImpl.java AttrImpl.java
DOMImplementationListImpl.java
Log:
Moving DOM support up to DOM Level 3.
Revision Changes Path
1.48 +3 -3 xml-xerces/java/src/org/apache/xerces/dom/AttrNSImpl.java
Index: AttrNSImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/dom/AttrNSImpl.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- AttrNSImpl.java 4 Nov 2004 20:24:28 -0000 1.47
+++ AttrNSImpl.java 2 May 2005 22:02:22 -0000 1.48
@@ -293,7 +293,7 @@
/**
- * @see org.apache.xerces.dom3.TypeInfo#getTypeName()
+ * @see org.w3c.dom.TypeInfo#getTypeName()
*/
public String getTypeName() {
if (type !=null){
@@ -333,7 +333,7 @@
}
/**
- * @see org.apache.xerces.dom3.TypeInfo#getTypeNamespace()
+ * @see org.w3c.dom.TypeInfo#getTypeNamespace()
*/
public String getTypeNamespace() {
if (type !=null) {
1.33 +4 -4
xml-xerces/java/src/org/apache/xerces/dom/DOMConfigurationImpl.java
Index: DOMConfigurationImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/dom/DOMConfigurationImpl.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- DOMConfigurationImpl.java 5 Oct 2004 17:12:50 -0000 1.32
+++ DOMConfigurationImpl.java 2 May 2005 22:02:22 -0000 1.33
@@ -22,9 +22,9 @@
import java.util.Locale;
import java.util.Vector;
-import org.apache.xerces.dom3.DOMConfiguration;
-import org.apache.xerces.dom3.DOMErrorHandler;
-import org.apache.xerces.dom3.DOMStringList;
+import org.w3c.dom.DOMConfiguration;
+import org.w3c.dom.DOMErrorHandler;
+import org.w3c.dom.DOMStringList;
import org.apache.xerces.impl.Constants;
import org.apache.xerces.impl.XMLEntityManager;
1.60 +3 -3
xml-xerces/java/src/org/apache/xerces/dom/DOMNormalizer.java
Index: DOMNormalizer.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/dom/DOMNormalizer.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- DOMNormalizer.java 4 Nov 2004 21:14:54 -0000 1.59
+++ DOMNormalizer.java 2 May 2005 22:02:22 -0000 1.60
@@ -19,8 +19,8 @@
import java.util.Vector;
-import org.apache.xerces.dom3.DOMError;
-import org.apache.xerces.dom3.DOMErrorHandler;
+import org.w3c.dom.DOMError;
+import org.w3c.dom.DOMErrorHandler;
import org.apache.xerces.impl.Constants;
import org.apache.xerces.impl.RevalidationHandler;
import org.apache.xerces.impl.dv.XSSimpleType;
1.75 +2 -2 xml-xerces/java/src/org/apache/xerces/dom/NodeImpl.java
Index: NodeImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/dom/NodeImpl.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- NodeImpl.java 5 Oct 2004 17:12:51 -0000 1.74
+++ NodeImpl.java 2 May 2005 22:02:22 -0000 1.75
@@ -21,7 +21,7 @@
import java.io.Serializable;
import java.util.Hashtable;
-import org.apache.xerces.dom3.UserDataHandler;
+import org.w3c.dom.UserDataHandler;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentType;
1.11 +3 -3
xml-xerces/java/src/org/apache/xerces/dom/PSVIDocumentImpl.java
Index: PSVIDocumentImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/dom/PSVIDocumentImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PSVIDocumentImpl.java 5 Oct 2004 17:12:50 -0000 1.10
+++ PSVIDocumentImpl.java 2 May 2005 22:02:22 -0000 1.11
@@ -23,8 +23,8 @@
// REVISIT: This is a HACK! DO NOT MODIFY THIS import.
// It allows us to expose DOM L3 implemenation via org.w3c.dom
packages
-import org.apache.xerces.dom3.DOMConfiguration;
-import org.apache.xerces.dom3.UserDataHandler;
+import org.w3c.dom.DOMConfiguration;
+import org.w3c.dom.UserDataHandler;
import org.w3c.dom.*;
/**
1.70 +4 -4
xml-xerces/java/src/org/apache/xerces/dom/ElementImpl.java
Index: ElementImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/dom/ElementImpl.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- ElementImpl.java 5 Oct 2004 17:12:50 -0000 1.69
+++ ElementImpl.java 2 May 2005 22:02:22 -0000 1.70
@@ -24,7 +24,7 @@
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
-import org.apache.xerces.dom3.TypeInfo;
+import org.w3c.dom.TypeInfo;
import org.apache.xerces.util.URI;
/**
@@ -1022,14 +1022,14 @@
}
/**
- * @see org.apache.xerces.dom3.TypeInfo#getTypeName()
+ * @see org.w3c.dom.TypeInfo#getTypeName()
*/
public String getTypeName() {
return null;
}
/**
- * @see org.apache.xerces.dom3.TypeInfo#getTypeNamespace()
+ * @see org.w3c.dom.TypeInfo#getTypeNamespace()
*/
public String getTypeNamespace() {
return null;
1.85 +2 -2
xml-xerces/java/src/org/apache/xerces/dom/DocumentImpl.java
Index: DocumentImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/dom/DocumentImpl.java,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- DocumentImpl.java 22 Mar 2005 03:35:05 -0000 1.84
+++ DocumentImpl.java 2 May 2005 22:02:22 -0000 1.85
@@ -22,7 +22,7 @@
import org.apache.xerces.dom.events.EventImpl;
import org.apache.xerces.dom.events.MutationEventImpl;
-import org.apache.xerces.dom3.UserDataHandler;
+import org.w3c.dom.UserDataHandler;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.DOMImplementation;
1.47 +3 -3
xml-xerces/java/src/org/apache/xerces/dom/ElementNSImpl.java
Index: ElementNSImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/dom/ElementNSImpl.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ElementNSImpl.java 4 Nov 2004 21:35:08 -0000 1.46
+++ ElementNSImpl.java 2 May 2005 22:02:22 -0000 1.47
@@ -420,7 +420,7 @@
/**
- * @see org.apache.xerces.dom3.TypeInfo#getTypeName()
+ * @see org.w3c.dom.TypeInfo#getTypeName()
*/
public String getTypeName() {
if (type !=null){
@@ -430,7 +430,7 @@
}
/**
- * @see org.apache.xerces.dom3.TypeInfo#getTypeNamespace()
+ * @see org.w3c.dom.TypeInfo#getTypeNamespace()
*/
public String getTypeNamespace() {
if (type !=null){
1.29 +2 -2
xml-xerces/java/src/org/apache/xerces/dom/DocumentTypeImpl.java
Index: DocumentTypeImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/dom/DocumentTypeImpl.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- DocumentTypeImpl.java 5 Oct 2004 17:12:51 -0000 1.28
+++ DocumentTypeImpl.java 2 May 2005 22:02:22 -0000 1.29
@@ -21,7 +21,7 @@
import org.w3c.dom.Node;
import org.w3c.dom.NamedNodeMap;
import java.util.Hashtable;
-import org.apache.xerces.dom3.UserDataHandler;
+import org.w3c.dom.UserDataHandler;
/**
* This class represents a Document Type <em>declaraction</em> in
1.12 +2 -2
xml-xerces/java/src/org/apache/xerces/dom/DOMLocatorImpl.java
Index: DOMLocatorImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/dom/DOMLocatorImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DOMLocatorImpl.java 5 Oct 2004 17:12:49 -0000 1.11
+++ DOMLocatorImpl.java 2 May 2005 22:02:22 -0000 1.12
@@ -16,7 +16,7 @@
package org.apache.xerces.dom;
-import org.apache.xerces.dom3.DOMLocator;
+import org.w3c.dom.DOMLocator;
import org.w3c.dom.Node;
1.17 +3 -3
xml-xerces/java/src/org/apache/xerces/dom/DOMImplementationSourceImpl.java
Index: DOMImplementationSourceImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/dom/DOMImplementationSourceImpl.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DOMImplementationSourceImpl.java 5 Oct 2004 17:12:51 -0000 1.16
+++ DOMImplementationSourceImpl.java 2 May 2005 22:02:22 -0000 1.17
@@ -18,8 +18,8 @@
import java.util.StringTokenizer;
import java.util.Vector;
-import org.apache.xerces.dom3.DOMImplementationList;
-import org.apache.xerces.dom3.DOMImplementationSource;
+import org.w3c.dom.DOMImplementationList;
+import org.w3c.dom.DOMImplementationSource;
import org.w3c.dom.DOMImplementation;
import org.apache.xerces.dom.DOMImplementationListImpl;
1.14 +3 -3
xml-xerces/java/src/org/apache/xerces/dom/DOMErrorImpl.java
Index: DOMErrorImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/dom/DOMErrorImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DOMErrorImpl.java 5 Oct 2004 17:12:51 -0000 1.13
+++ DOMErrorImpl.java 2 May 2005 22:02:22 -0000 1.14
@@ -16,8 +16,8 @@
package org.apache.xerces.dom;
-import org.apache.xerces.dom3.DOMError;
-import org.apache.xerces.dom3.DOMLocator;
+import org.w3c.dom.DOMError;
+import org.w3c.dom.DOMLocator;
import org.apache.xerces.xni.parser.XMLParseException;
1.50 +2 -2 xml-xerces/java/src/org/apache/xerces/dom/ParentNode.java
Index: ParentNode.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/dom/ParentNode.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ParentNode.java 22 Mar 2005 04:06:41 -0000 1.49
+++ ParentNode.java 2 May 2005 22:02:22 -0000 1.50
@@ -25,7 +25,7 @@
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.apache.xerces.dom3.UserDataHandler;
+import org.w3c.dom.UserDataHandler;
/**
* ParentNode inherits from ChildNode and adds the capability of having child
1.85 +3 -3
xml-xerces/java/src/org/apache/xerces/dom/CoreDocumentImpl.java
Index: CoreDocumentImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/dom/CoreDocumentImpl.java,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- CoreDocumentImpl.java 7 Mar 2005 23:28:40 -0000 1.84
+++ CoreDocumentImpl.java 2 May 2005 22:02:22 -0000 1.85
@@ -21,8 +21,8 @@
import java.util.Hashtable;
import org.apache.xerces.util.URI;
-import org.apache.xerces.dom3.DOMConfiguration;
-import org.apache.xerces.dom3.UserDataHandler;
+import org.w3c.dom.DOMConfiguration;
+import org.w3c.dom.UserDataHandler;
import org.apache.xerces.util.XMLChar;
import org.apache.xerces.util.XML11Char;
import org.apache.xerces.xni.NamespaceContext;
1.4 +4 -4
xml-xerces/java/src/org/apache/xerces/dom/DOMStringListImpl.java
Index: DOMStringListImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/dom/DOMStringListImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DOMStringListImpl.java 5 Oct 2004 17:12:51 -0000 1.3
+++ DOMStringListImpl.java 2 May 2005 22:02:22 -0000 1.4
@@ -18,7 +18,7 @@
import java.util.Vector;
-import org.apache.xerces.dom3.DOMStringList;
+import org.w3c.dom.DOMStringList;
/**
* DOM Level 3
@@ -49,7 +49,7 @@
}
/**
- * @see org.apache.xerces.dom3.DOMStringList#item(int)
+ * @see org.w3c.dom.DOMStringList#item(int)
*/
public String item(int index) {
try {
@@ -60,14 +60,14 @@
}
/**
- * @see org.apache.xerces.dom3.DOMStringList#getLength()
+ * @see org.w3c.dom.DOMStringList#getLength()
*/
public int getLength() {
return fStrings.size();
}
/**
- * @see org.apache.xerces.dom3.DOMStringList#contains(String)
+ * @see org.w3c.dom.DOMStringList#contains(String)
*/
public boolean contains(String param) {
return fStrings.contains(param) ;
1.5 +2 -2
xml-xerces/java/src/org/apache/xerces/dom/DOMXSImplementationSourceImpl.java
Index: DOMXSImplementationSourceImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/dom/DOMXSImplementationSourceImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DOMXSImplementationSourceImpl.java 5 Oct 2004 17:12:50 -0000
1.4
+++ DOMXSImplementationSourceImpl.java 2 May 2005 22:02:22 -0000
1.5
@@ -17,7 +17,7 @@
package org.apache.xerces.dom;
import org.apache.xerces.impl.xs.XSImplementationImpl;
-import org.apache.xerces.dom3.DOMImplementationList;
+import org.w3c.dom.DOMImplementationList;
import org.w3c.dom.DOMImplementation;
import java.util.Vector;
1.64 +4 -4 xml-xerces/java/src/org/apache/xerces/dom/AttrImpl.java
Index: AttrImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/dom/AttrImpl.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- AttrImpl.java 4 Nov 2004 20:10:19 -0000 1.63
+++ AttrImpl.java 2 May 2005 22:02:22 -0000 1.64
@@ -20,7 +20,7 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import org.apache.xerces.dom3.TypeInfo;
+import org.w3c.dom.TypeInfo;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
@@ -279,14 +279,14 @@
}
/**
- * @see org.apache.xerces.dom3.TypeInfo#getTypeName()
+ * @see org.w3c.dom.TypeInfo#getTypeName()
*/
public String getTypeName() {
return (String)type;
}
/**
- * @see org.apache.xerces.dom3.TypeInfo#getTypeNamespace()
+ * @see org.w3c.dom.TypeInfo#getTypeNamespace()
*/
public String getTypeNamespace() {
if (type != null) {
1.5 +1 -1
xml-xerces/java/src/org/apache/xerces/dom/DOMImplementationListImpl.java
Index: DOMImplementationListImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/dom/DOMImplementationListImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DOMImplementationListImpl.java 5 Oct 2004 17:12:50 -0000 1.4
+++ DOMImplementationListImpl.java 2 May 2005 22:02:22 -0000 1.5
@@ -17,7 +17,7 @@
package org.apache.xerces.dom;
import java.util.Vector;
-import org.apache.xerces.dom3.DOMImplementationList;
+import org.w3c.dom.DOMImplementationList;
import org.w3c.dom.DOMImplementation;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
