sandygao    2004/03/17 12:11:49

  Modified:    java/src/org/apache/xerces/impl/msg
                        XMLSchemaMessages.properties
               java/src/org/apache/xerces/impl/xs/traversers
                        XSDNotationTraverser.java
  Log:
  Use a more meaningful error code for schema erratum E1-16.
  
  Revision  Changes    Path
  1.75      +2 -1      
xml-xerces/java/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties
  
  Index: XMLSchemaMessages.properties
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- XMLSchemaMessages.properties      17 Mar 2004 03:40:28 -0000      1.74
  +++ XMLSchemaMessages.properties      17 Mar 2004 20:11:49 -0000      1.75
  @@ -279,6 +279,7 @@
           FixedFacetValue = FixedFacetValue: In the definition of {3}, the value 
''{1}'' for the facet ''{0}'' is invalid, because the value for ''{0}'' has been set 
to ''{2}'' in one of the ancestor types, and '{'fixed'}' = true.
           InvalidRegex = InvalidRegex: Pattern value ''{0}'' is not a valid regular 
expression. The reported error was: ''{1}''.
           maxOccurLimit = Current configuration of the parser doesn''t allow a 
maxOccurs attribute value to be set greater than the value {0}.
  +        PublicSystemOnNotation = PublicSystemOnNotation: At least one of ''public'' 
and ''system'' must appear in element ''notation''.
           SchemaLocation = SchemaLocation: schemaLocation value = ''{0}'' must have 
even number of URI''s.
           TargetNamespace.1 = TargetNamespace.1: Expecting namespace ''{0}'', but the 
target namespace of the schema document is ''{1}''.
           TargetNamespace.2 = TargetNamespace.2: Expecting no namespace, but the 
schema document has a target namespace of ''{1}''.
  
  
  
  1.15      +2 -2      
xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDNotationTraverser.java
  
  Index: XSDNotationTraverser.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDNotationTraverser.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- XSDNotationTraverser.java 17 Mar 2004 05:59:54 -0000      1.14
  +++ XSDNotationTraverser.java 17 Mar 2004 20:11:49 -0000      1.15
  @@ -64,7 +64,7 @@
           }
                
                if (systemAttr == null && publicAttr == null)
  -                     reportSchemaError("s4s-att-must-appear", new 
Object[]{SchemaSymbols.ELT_NOTATION, "system or public"}, elmNode);
  +                     reportSchemaError("PublicSystemOnNotation", null, elmNode);
   
           XSNotationDecl notation = new XSNotationDecl();
           notation.fName = nameAttr;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to