Author: mukulg
Date: Tue Mar 22 08:54:44 2011
New Revision: 1084108
URL: http://svn.apache.org/viewvc?rev=1084108&view=rev
Log:
doing little refactoring of codebase.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/util/XSTypeHelper.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java?rev=1084108&r1=1084107&r2=1084108&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java
Tue Mar 22 08:54:44 2011
@@ -948,15 +948,8 @@ public class XMLAssertPsychopathXPath2Im
XSAssertImpl assertImpl = assertError.getAssertion();
boolean isList = assertError.isList();
String value = assertError.getValue();
-
- XSTypeDefinition typeDef = assertImpl.getTypeDefinition();
- String typeNameStr = "";
- if (typeDef instanceof XSSimpleTypeDefinition) {
- typeNameStr = ((XSSimpleTypeDecl)typeDef).getTypeName();
- }
- else {
- typeNameStr = ((XSComplexTypeDecl)typeDef).getTypeName();
- }
+
+ String typeNameStr =
XSTypeHelper.getSchemaTypeName(assertImpl.getTypeDefinition());
String elemErrorAnnotation = element.rawname;
if (assertImpl.getAttrName() != null) {
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/util/XSTypeHelper.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/util/XSTypeHelper.java?rev=1084108&r1=1084107&r2=1084108&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/util/XSTypeHelper.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/util/XSTypeHelper.java
Tue Mar 22 08:54:44 2011
@@ -26,8 +26,10 @@ import org.apache.xerces.impl.dv.Invalid
import org.apache.xerces.impl.dv.ValidatedInfo;
import org.apache.xerces.impl.dv.ValidationContext;
import org.apache.xerces.impl.dv.XSSimpleType;
+import org.apache.xerces.impl.dv.xs.XSSimpleTypeDecl;
import org.apache.xerces.impl.validation.ValidationState;
import org.apache.xerces.impl.xs.SchemaSymbols;
+import org.apache.xerces.impl.xs.XSComplexTypeDecl;
import org.apache.xerces.impl.xs.XSMessageFormatter;
import org.apache.xerces.util.XMLChar;
import org.apache.xerces.xni.NamespaceContext;
@@ -220,4 +222,23 @@ public class XSTypeHelper {
} // isComplexTypeDerivedFromSTListByExt
+
+ /*
+ * Get string value of type name of an XML Schema type definition. This
method is useful if XML Schema validator specific names,
+ * of anonymous types are also needed.
+ */
+ public static String getSchemaTypeName(XSTypeDefinition typeDefn) {
+
+ String typeNameStr = "";
+ if (typeDefn instanceof XSSimpleTypeDefinition) {
+ typeNameStr = ((XSSimpleTypeDecl) typeDefn).getTypeName();
+ }
+ else {
+ typeNameStr = ((XSComplexTypeDecl) typeDefn).getTypeName();
+ }
+
+ return typeNameStr;
+
+ } // getSchemaTypeName
+
} // class XSTypeHelper
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
