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/05 20:49:39 UTC

cvs commit: xml-xerces/java/src/org/apache/xerces/validators/schema TraverseSchema.java

neilg       01/11/05 11:49:39

  Modified:    java/src/org/apache/xerces/validators/schema Tag: xerces_j_1
                        TraverseSchema.java
  Log:
  after the change to DefaultEntityHandler, make sure TraverseSchema still emits warnings when included or imported schemas cannot be located.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.242.2.8 +9 -8      xml-xerces/java/src/org/apache/xerces/validators/schema/Attic/TraverseSchema.java
  
  Index: TraverseSchema.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/schema/Attic/TraverseSchema.java,v
  retrieving revision 1.242.2.7
  retrieving revision 1.242.2.8
  diff -u -r1.242.2.7 -r1.242.2.8
  --- TraverseSchema.java	2001/10/30 21:00:30	1.242.2.7
  +++ TraverseSchema.java	2001/11/05 19:49:37	1.242.2.8
  @@ -129,7 +129,7 @@
    *
    * @see org.apache.xerces.validators.common.Grammar
    *
  - * @version $Id: TraverseSchema.java,v 1.242.2.7 2001/10/30 21:00:30 sandygao Exp $
  + * @version $Id: TraverseSchema.java,v 1.242.2.8 2001/11/05 19:49:37 neilg Exp $
    */
   public class TraverseSchema implements
                               NamespacesScope.NamespacesHandler{
  @@ -1079,7 +1079,7 @@
           parser.setEntityResolver( (fEntityResolver != null)? (fEntityResolver):(new Resolver()) );
           parser.setErrorHandler(  new ErrorHandler()
               {
  -                public void fatalError(SAXParseException ex) throws SAXException {
  +                public void error(SAXParseException ex) throws SAXException {
                       StringBuffer str = new StringBuffer();
                       String systemId_ = ex.getSystemId();
                       if (systemId_ != null) {
  @@ -1094,7 +1094,7 @@
                           System.err.println("[Warning] "+
                                  str.toString()+": "+ message);
                       } else { // do standard thing
  -                        System.err.println("[Fatal Error] "+
  +                        System.err.println("[Error] "+
                                  str.toString()+":"+message);
                           throw ex;
                       }
  @@ -1115,7 +1115,8 @@
           try {
               parser.parse( source );
           }catch( IOException e ) {
  -            e.printStackTrace();
  +            // we already produce warnings on IOExceptions!
  +            // e.printStackTrace();
           }catch( SAXException e ) {
               //e.printStackTrace();
           }
  @@ -2065,7 +2066,7 @@
            parser.setEntityResolver( (fEntityResolver != null)? (fEntityResolver):(new Resolver()) );
            parser.setErrorHandler( new ErrorHandler  ()
               {
  -                public void fatalError(SAXParseException ex) throws SAXException {
  +                public void error(SAXParseException ex) throws SAXException {
                       StringBuffer str = new StringBuffer();
                       String systemId_ = ex.getSystemId();
                       if (systemId_ != null) {
  @@ -2080,7 +2081,7 @@
                           System.err.println("[Warning] "+
                                  str.toString()+": "+ message);
                       } else { // do standard thing
  -                        System.err.println("[Fatal Error] "+
  +                        System.err.println("[Error] "+
                                  str.toString()+":"+message);
                           throw ex;
                       }
  @@ -2101,7 +2102,7 @@
            try {
                parser.parse( source );
            }catch( IOException e ) {
  -             e.printStackTrace();
  +             // e.printStackTrace();
            }catch( SAXException e ) {
                e.printStackTrace();
            }
  @@ -9031,7 +9032,7 @@
           }
   
           /** Error. */
  -        public void error(SAXParseException ex) {
  +        public void error(SAXParseException ex) throws SAXException {
               System.err.println("[Error] "+
                                  getLocationString(ex)+": "+
                                  ex.getMessage());
  
  
  

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