You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ne...@apache.org on 2001/11/07 21:08:49 UTC

cvs commit: xml-xerces/java/src/org/apache/xerces/utils XMLMessages.java

neilg       01/11/07 12:08:49

  Modified:    java/src/org/apache/xerces/validators/common Tag: xerces_j_1
                        XMLValidator.java
               java/src/org/apache/xerces/msg Tag: xerces_j_1
                        XMLMessages.java
               java/src/org/apache/xerces/utils Tag: xerces_j_1
                        XMLMessages.java
  Log:
  fix for bug#3040.  Patch from Pavani Mukthipudi.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.186.2.8 +9 -1      xml-xerces/java/src/org/apache/xerces/validators/common/Attic/XMLValidator.java
  
  Index: XMLValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/common/Attic/XMLValidator.java,v
  retrieving revision 1.186.2.7
  retrieving revision 1.186.2.8
  diff -u -r1.186.2.7 -r1.186.2.8
  --- XMLValidator.java	2001/10/31 21:17:17	1.186.2.7
  +++ XMLValidator.java	2001/11/07 20:08:48	1.186.2.8
  @@ -127,7 +127,7 @@
   /**
    * This class is the super all-in-one validator used by the parser.
    *
  - * @version $Id: XMLValidator.java,v 1.186.2.7 2001/10/31 21:17:17 elena Exp $
  + * @version $Id: XMLValidator.java,v 1.186.2.8 2001/11/07 20:08:48 neilg Exp $
    */
   public final class XMLValidator
       implements DefaultEntityHandler.EventHandler,
  @@ -2575,6 +2575,14 @@
                  if (attPrefix == fNamespacesPrefix) {
                     int nsPrefix = attrList.getAttrLocalpart(index);
                     int uri = fStringPool.addSymbol(attrList.getAttValue(index));
  +                  if(uri == StringPool.EMPTY_STRING) {
  + 		 		      Object[] args = { fStringPool.toString(nsPrefix) };
  + 		 		      fErrorReporter.reportError(fErrorReporter.getLocator(),
  + 		 		 		 		 		 		 XMLMessages.XMLNS_DOMAIN,
  + 		 		 		 		 		 		 XMLMessages.MSG_NAMESPACE_NAME_EMPTY,
  + 		 		 		 		 		 		 XMLMessages.NC_NAMESPACE_NAME_EMPTY,
  + 		 		 		 		 		 		 args, XMLErrorReporter.ERRORTYPE_RECOVERABLE_ERROR);
  + 		 		   }
                     fNamespacesScope.setNamespaceForPrefix(nsPrefix, uri);
   
                     if (fValidating && fSchemaValidation) {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.1   +2 -1      xml-xerces/java/src/org/apache/xerces/msg/Attic/XMLMessages.java
  
  Index: XMLMessages.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/msg/Attic/XMLMessages.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- XMLMessages.java	2001/08/08 18:20:19	1.5
  +++ XMLMessages.java	2001/11/07 20:08:49	1.5.2.1
  @@ -279,7 +279,8 @@
           { "PrefixDeclared", "The namespace prefix \"{0}\" was not declared." },
           { "MSG_ATT_DEFAULT_INVALID", "The defaultValue \"{1}\" of attribute \"{0}\" is not legal as for the lexical constraints of this attribute type." },
           { "MSG_GENERIC_SCHEMA_ERROR", "General Schema Error: {0}." },
  -        { "MSG_DTD_SCHEMA_ERROR", "Xerces-J parser may not validate an XML document correctly if both XML Schema and DTD are present." }
  +        { "MSG_DTD_SCHEMA_ERROR", "Xerces-J parser may not validate an XML document correctly if both XML Schema and DTD are present." },
  +        { "NamespaceNameEmpty", "The namespace name for prefix \"{0}\" is empty." }
   
       };
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.1   +5 -0      xml-xerces/java/src/org/apache/xerces/utils/Attic/XMLMessages.java
  
  Index: XMLMessages.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/utils/Attic/XMLMessages.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- XMLMessages.java	2001/08/08 18:20:19	1.5
  +++ XMLMessages.java	2001/11/07 20:08:49	1.5.2.1
  @@ -312,6 +312,7 @@
           MSG_ATT_DEFAULT_INVALID = 168,
           MSG_GENERIC_SCHEMA_ERROR = 169,
           MSG_DTD_SCHEMA_ERROR = 170,
  +        MSG_NAMESPACE_NAME_EMPTY = 171,
   
           // ...
           MSG_MAX_CODE = 200;
  @@ -488,6 +489,7 @@
           "MSG_ATT_DEFAULT_INVALID",      // 168, "MSG_ATT_DEFAULT_INVALID"
           "MSG_GENERIC_SCHEMA_ERROR",     // 169  "MSG_GENERIC_SCHEMA_ERROR"
           "MSG_DTD_SCHEMA_ERROR",         // 170
  +        "NamespaceNameEmpty",           // 171, "MSG_NAMESPACE_NAME_EMPTY"
           // ...
           ""                              //
       };
  @@ -641,6 +643,7 @@
           NC_PREFIX_DECLARED = 144,
           VC_ATTRIBUTE_DEFAULT_LEGAL = 145,
           SCHEMA_GENERIC_ERROR = 146,
  +        NC_NAMESPACE_NAME_EMPTY = 147,
           
           // ...
           CONSTRAINT_MAX_CODE = 200;
  @@ -1239,6 +1242,8 @@
                          "No element type may have more than one NOTATION attribute specified."),
       // NC_PREFIX_DECLARED = 144
           new Constraint("4.", "", "NC: Prefix Declared", ""),
  +    // NC_NAMESPACE_NAME_EMPTY = 147
  +        new Constraint("","","NC: Namespace name is empty",""),
   
           // ...
           new Constraint(null, null, null, null)
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org