You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mr...@apache.org on 2004/03/15 23:55:11 UTC

cvs commit: xml-xerces/java/src/org/apache/xerces/dom DOMNormalizer.java

mrglavas    2004/03/15 14:55:11

  Modified:    java/src/org/apache/xerces/dom DOMNormalizer.java
  Log:
  Fixing Bug #27585:
  http://nagoya.apache.org/bugzilla/show_bug.cgi?id=27585
  
  Applying patch by Naela Nissar. Now we report the related
  node for some errors detected in normalizeNode and
  namespaceFixUp.
  
  Revision  Changes    Path
  1.51      +8 -8      xml-xerces/java/src/org/apache/xerces/dom/DOMNormalizer.java
  
  Index: DOMNormalizer.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/dom/DOMNormalizer.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- DOMNormalizer.java	24 Feb 2004 23:23:17 -0000	1.50
  +++ DOMNormalizer.java	15 Mar 2004 22:55:10 -0000	1.51
  @@ -276,7 +276,7 @@
   				                DOMMessageFormatter.DOM_DOMAIN, 
   				                "wf-invalid-character-in-node-name", 
   				                new Object[]{"Element", node.getNodeName()});
  -                            reportDOMError(fErrorHandler, fError, fLocator, msg, DOMError.SEVERITY_ERROR, null, 
  +                            reportDOMError(fErrorHandler, fError, fLocator, msg, DOMError.SEVERITY_ERROR, node, 
                                   "wf-invalid-character-in-node-name");                       
                       }
                   }
  @@ -312,7 +312,7 @@
   				                              "wf-invalid-character-in-node-name", 
   				                               new Object[]{"Attr",node.getNodeName()});
   				                            reportDOMError(fErrorHandler, fError, fLocator, msg, DOMError.SEVERITY_ERROR, 
  -				                                null, "wf-invalid-character-in-node-name");
  +				                                node, "wf-invalid-character-in-node-name");
                                       }
                                   }           
                               }
  @@ -714,13 +714,13 @@
                       String msg = DOMMessageFormatter.formatMessage(
                           DOMMessageFormatter.DOM_DOMAIN, "NullLocalElementName", 
                           new Object[]{element.getNodeName()});
  -                    reportDOMError(fErrorHandler, fError, fLocator, msg, DOMError.SEVERITY_FATAL_ERROR, null, 
  +                    reportDOMError(fErrorHandler, fError, fLocator, msg, DOMError.SEVERITY_FATAL_ERROR, element, 
                           "NullLocalElementName");
                   } else {
                       String msg = DOMMessageFormatter.formatMessage(
                           DOMMessageFormatter.DOM_DOMAIN, "NullLocalElementName", 
                           new Object[]{element.getNodeName()});
  -                    reportDOMError(fErrorHandler, fError, fLocator, msg, DOMError.SEVERITY_ERROR, null, 
  +                    reportDOMError(fErrorHandler, fError, fLocator, msg, DOMError.SEVERITY_ERROR, element, 
                           "NullLocalElementName");
                   }
               } else { // uri=null and no colon (DOM L2 node)
  @@ -786,7 +786,7 @@
   				                            DOMMessageFormatter.DOM_DOMAIN, 
   				                            "wf-invalid-character-in-node-name", 
   				                            new Object[]{"Attribute", attr.getNodeName()});
  -                                        reportDOMError(fErrorHandler, fError, fLocator, msg, DOMError.SEVERITY_ERROR, null, 
  +                                        reportDOMError(fErrorHandler, fError, fLocator, msg, DOMError.SEVERITY_ERROR, attr, 
                                               "wf-invalid-character-in-node-name");  
                                   }
                           }
  @@ -868,13 +868,13 @@
                               String msg = DOMMessageFormatter.formatMessage(
                                   DOMMessageFormatter.DOM_DOMAIN, 
                                   "NullLocalAttrName", new Object[]{attr.getNodeName()});
  -                            reportDOMError(fErrorHandler, fError, fLocator, msg, DOMError.SEVERITY_FATAL_ERROR, null, 
  +                            reportDOMError(fErrorHandler, fError, fLocator, msg, DOMError.SEVERITY_FATAL_ERROR, attr, 
                                   "NullLocalAttrName");
                           } else {
                               String msg = DOMMessageFormatter.formatMessage(
                                   DOMMessageFormatter.DOM_DOMAIN, 
                                   "NullLocalAttrName", new Object[]{attr.getNodeName()});
  -                            reportDOMError(fErrorHandler, fError, fLocator, msg, DOMError.SEVERITY_ERROR, null, 
  +                            reportDOMError(fErrorHandler, fError, fLocator, msg, DOMError.SEVERITY_ERROR, attr, 
                                   "NullLocalAttrName");
                           }
                       } else {
  
  
  

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