Author: amilas
Date: Wed Oct 17 01:28:04 2007
New Revision: 585408
URL: http://svn.apache.org/viewvc?rev=585408&view=rev
Log:
added the multiple pattern faceset support
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java?rev=585408&r1=585407&r2=585408&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
(original)
+++
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
Wed Oct 17 01:28:04 2007
@@ -1511,7 +1511,14 @@
XmlSchemaPatternFacet pattern = (XmlSchemaPatternFacet) obj;
// some patterns contain \ so we have to replace them
String patternString = pattern.getValue().toString();
- metaInfHolder.setPatternFacet(patternString.replaceAll("\\\\",
"\\\\\\\\"));
+ // replace backword slashes
+ patternString = patternString.replaceAll("\\\\", "\\\\\\\\");
+ if ((metaInfHolder.getPatternFacet() != null) &&
+ (metaInfHolder.getPatternFacet().trim().length() > 0)){
+ // i.e there is a pattern faceset
+ patternString = metaInfHolder.getPatternFacet().trim() +
"|" + patternString;
+ }
+ metaInfHolder.setPatternFacet(patternString);
}
else if (obj instanceof XmlSchemaEnumerationFacet) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
