Author: mrglavas
Date: Wed Aug 19 04:26:02 2009
New Revision: 805663
URL: http://svn.apache.org/viewvc?rev=805663&view=rev
Log:
Partially applying the changes in SVN rev 805582 to the branch to keep the DOM
implementation in synch with the trunk. These appear to be minor fixes which
are independent of the other changes made in SVN rev 805582.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/AttrNSImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ElementNSImpl.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/AttrNSImpl.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/AttrNSImpl.java?rev=805663&r1=805662&r2=805663&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/AttrNSImpl.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/AttrNSImpl.java
Wed Aug 19 04:26:02 2009
@@ -325,7 +325,7 @@
String typeNameArg,
int derivationMethod) {
if (type != null) {
- if (type instanceof XSSimpleTypeDefinition) {
+ if (type instanceof XSSimpleTypeDecl) {
return ((XSSimpleTypeDecl) type).isDOMDerivedFrom(
typeNamespaceArg, typeNameArg, derivationMethod);
}
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ElementNSImpl.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ElementNSImpl.java?rev=805663&r1=805662&r2=805663&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ElementNSImpl.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ElementNSImpl.java
Wed Aug 19 04:26:02 2009
@@ -349,9 +349,9 @@
*/
public String getTypeName() {
if (type !=null){
- if (type instanceof XSSimpleTypeDefinition) {
+ if (type instanceof XSSimpleTypeDecl) {
return ((XSSimpleTypeDecl) type).getTypeName();
- } else {
+ } else if (type instanceof XSComplexTypeDecl) {
return ((XSComplexTypeDecl) type).getTypeName();
}
}
@@ -389,10 +389,10 @@
synchronizeData();
}
if (type != null) {
- if (type instanceof XSSimpleTypeDefinition) {
+ if (type instanceof XSSimpleTypeDecl) {
return ((XSSimpleTypeDecl) type).isDOMDerivedFrom(
typeNamespaceArg, typeNameArg, derivationMethod);
- } else {
+ } else if (type instanceof XSComplexTypeDecl) {
return ((XSComplexTypeDecl) type).isDOMDerivedFrom(
typeNamespaceArg, typeNameArg, derivationMethod);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
