You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by el...@apache.org on 2003/11/19 00:47:42 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/dom DOMXSImplementationSourceImpl.java DOMImplementationSourceImpl.java
elena 2003/11/18 15:47:42
Modified: java/src/org/apache/xerces/dom
DOMImplementationSourceImpl.java
Added: java/src/org/apache/xerces/dom
DOMXSImplementationSourceImpl.java
Log:
Separate dom implementation source from XML Schema API and PSVI support.
Now DOMImplementationSourceImpl is only aware of Xerces DOM implementation.
DOMXSImplementationSourceImpl is aware of PSVI and xerces.xs implementations
Revision Changes Path
1.13 +5 -21 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DOMImplementationSourceImpl.java 14 Nov 2003 19:35:53 -0000 1.12
+++ DOMImplementationSourceImpl.java 18 Nov 2003 23:47:42 -0000 1.13
@@ -62,7 +62,6 @@
import org.apache.xerces.dom3.DOMImplementationList;
import org.apache.xerces.dom3.DOMImplementationSource;
import org.apache.xerces.dom3.bootstrap.DOMImplementationListImpl;
-import org.apache.xerces.impl.xs.XSImplementationImpl;
import org.w3c.dom.DOMImplementation;
/**
@@ -70,8 +69,9 @@
* implemented <code>DOMImplementationSource</code> object is listed in the
* binding-specific list of available sources so that its
* <code>DOMImplementation</code> objects are made available.
+ *
* <p>See also the <a href='http://www.w3.org/2001/10/WD-DOM-Level-3-Core-20011017'>Document Object Model (DOM) Level 3 Core Specification</a>.
- *
+ *
* @version $Id$
*/
public class DOMImplementationSourceImpl
@@ -98,16 +98,7 @@
if (testImpl(impl, features)) {
return impl;
}
- // if not try the PSVIDOMImplementation
- impl = PSVIDOMImplementationImpl.getDOMImplementation();
- if (testImpl(impl, features)) {
- return impl;
- }
- // if not try the XSImplementation
- impl = XSImplementationImpl.getDOMImplementation();
- if (testImpl(impl, features)) {
- return impl;
- }
+
return null;
}
@@ -136,15 +127,8 @@
if (testImpl(impl, features)) {
list.add(impl);
}
- impl = PSVIDOMImplementationImpl.getDOMImplementation();
- if (testImpl(impl, features)) {
- list.add(impl);
- }
- impl = XSImplementationImpl.getDOMImplementation();
- if (testImpl(impl, features)) {
- list.add(impl);
- }
+
return list;
}
1.1 xml-xerces/java/src/org/apache/xerces/dom/DOMXSImplementationSourceImpl.java
Index: DOMXSImplementationSourceImpl.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 2001, 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation and was
* originally based on software copyright (c) 1999, International
* Business Machines, Inc., http://www.apache.org. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.xerces.dom;
import org.apache.xerces.dom3.DOMImplementationList;
import org.apache.xerces.dom3.bootstrap.DOMImplementationListImpl;
import org.apache.xerces.impl.xs.XSImplementationImpl;
import org.w3c.dom.DOMImplementation;
/**
* Allows to retrieve <code>XSImplementation</code>, DOM Level 3 Core and LS implementations
* and PSVI implementation.
* <p>See also the <a href='http://www.w3.org/2001/10/WD-DOM-Level-3-Core-20011017'>Document Object Model (DOM) Level 3 Core Specification</a>.
* @author Elena Litani, IBM
* @version $Id: DOMXSImplementationSourceImpl.java,v 1.1 2003/11/18 23:47:42 elena Exp $
*/
public class DOMXSImplementationSourceImpl
extends DOMImplementationSourceImpl{
/**
* A method to request a DOM implementation.
* @param features A string that specifies which features are required.
* This is a space separated list in which each feature is specified
* by its name optionally followed by a space and a version number.
* This is something like: "XML 1.0 Traversal Events 2.0"
* @return An implementation that has the desired features, or
* <code>null</code> if this source has none.
*/
public DOMImplementation getDOMImplementation(String features) {
DOMImplementation impl = super.getDOMImplementation(features);
if (impl != null){
return impl;
}
// if not try the PSVIDOMImplementation
impl = PSVIDOMImplementationImpl.getDOMImplementation();
if (testImpl(impl, features)) {
return impl;
}
// if not try the XSImplementation
impl = XSImplementationImpl.getDOMImplementation();
if (testImpl(impl, features)) {
return impl;
}
return null;
}
/**
* DOM Level 3 Core - CR
*
* A method to request a list of DOM implementations that support the
* specified features and versions, as specified in .
* @param features A string that specifies which features and versions
* are required. This is a space separated list in which each feature
* is specified by its name optionally followed by a space and a
* version number. This is something like: "XML 3.0 Traversal +Events
* 2.0"
* @return A list of DOM implementations that support the desired
* features.
*/
public DOMImplementationList getDOMImplementationList(String features) {
// first check whether the CoreDOMImplementation would do
DOMImplementationListImpl list = (DOMImplementationListImpl)super.getDOMImplementationList(features);
DOMImplementation impl = PSVIDOMImplementationImpl.getDOMImplementation();
if (testImpl(impl, features)) {
list.add(impl);
}
impl = XSImplementationImpl.getDOMImplementation();
if (testImpl(impl, features)) {
list.add(impl);
}
return list;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org