stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8138721: ElementTraversal: javadoc warning; also, hasFeature shall return true

Browse Source 
Reviewed-by: lancea, dfuchs
This commit is contained in:
Joe Wang 2015-10-06 10:59:52 -07:00
parent df9e1bc8f7
commit 6b8fd86fa1
4 changed files with 41 additions and 16 deletions
jaxp
src/java.xml/share/classes
com/sun/org/apache/xerces/internal/dom
CoreDOMImplementationImpl.javaDOMImplementationImpl.java
org/w3c/dom
ElementTraversal.java
test/javax/xml/jaxp/unittest/dom
ElementTraversal.java

31
jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java

@ -101,7 +101,7 @@ public class CoreDOMImplementationImpl
* This is interpreted as "Version of the DOM API supported for the
* specified Feature", and in Level 1 should be "1.0"
*
* @return true iff this implementation is compatable with the specified
* @return true if this implementation is compatible with the specified
* feature and version.
*/
public boolean hasFeature(String feature, String version) {
@ -111,19 +111,22 @@ public class CoreDOMImplementationImpl
if (feature.startsWith("+")) {
feature = feature.substring(1);
}
return (
feature.equalsIgnoreCase("Core")
&& (anyVersion
|| version.equals("1.0")
|| version.equals("2.0")
|| version.equals("3.0")))
|| (feature.equalsIgnoreCase("XML")
&& (anyVersion
|| version.equals("1.0")
|| version.equals("2.0")
|| version.equals("3.0")))
|| (feature.equalsIgnoreCase("LS")
&& (anyVersion || version.equals("3.0")));
return (feature.equalsIgnoreCase("Core")
&& (anyVersion
|| version.equals("1.0")
|| version.equals("2.0")
|| version.equals("3.0")))
|| (feature.equalsIgnoreCase("XML")
&& (anyVersion
|| version.equals("1.0")
|| version.equals("2.0")
|| version.equals("3.0")))
|| (feature.equalsIgnoreCase("LS")
&& (anyVersion
|| version.equals("3.0")))
|| (feature.equalsIgnoreCase("ElementTraversal")
&& (anyVersion
|| version.equals("1.0")));
} // hasFeature(String,String):boolean

3
jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java

@ -83,6 +83,9 @@ public class DOMImplementationImpl extends CoreDOMImplementationImpl
* specified feature and version.
*/
public boolean hasFeature(String feature, String version) {
if (feature == null || feature.length() == 0) {
return false;
}
boolean result = super.hasFeature(feature, version);
if (!result) {

2
jaxp/src/java.xml/share/classes/org/w3c/dom/ElementTraversal.java

@ -50,7 +50,7 @@ package org.w3c.dom;
* elements of an element, for preprocessing before navigation.
*
* @see
* <a href='http://www.w3.org/TR/ElementTraversal/'><cite>Element Traversal Specification</cite></a>.
* <a href='http://www.w3.org/TR/ElementTraversal/'><cite>Element Traversal Specification</cite></a>
*
* @since 9
*/

21
jaxp/test/javax/xml/jaxp/unittest/dom/ElementTraversal.java

@ -31,15 +31,34 @@ import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import org.w3c.dom.Document;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Element;
import org.xml.sax.SAXException;
/*
* @bug 8135283
* @bug 8135283 8138721
* @summary Tests for the Element Traversal interface.
*/
public class ElementTraversal {
/*
Verifies that ElementTraversal is supported.
*/
@Test(dataProvider = "doc")
public void testHasFeature(Document doc) {
DOMImplementation di = doc.getImplementation();
//return false if feasure == null
Assert.assertFalse(di.hasFeature(null, null));
//A feature is supported without specifying version
Assert.assertTrue(di.hasFeature("ElementTraversal", null));
Assert.assertTrue(di.hasFeature("ElementTraversal", ""));
//ElementTraversal Version 1.0 is supported
Assert.assertTrue(di.hasFeature("ElementTraversal", "1.0"));
}
/*
Verifies the ElementTraversal interface by exercising all of its five
methods while reading through the xml document.