andyc       2003/01/26 22:11:42

  Modified:    java/src/org/apache/xerces/impl XMLDTDScannerImpl.java
               java/src/org/apache/xerces/impl/dtd XMLDTDValidator.java
               java/src/org/apache/xerces/xni XMLLocator.java
  Log:
  Fixed XMLLocator interface per mailing list discussion
  and updated implementation to comply.
  
  Revision  Changes    Path
  1.36      +6 -5      
xml-xerces/java/src/org/apache/xerces/impl/XMLDTDScannerImpl.java
  
  Index: XMLDTDScannerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLDTDScannerImpl.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- XMLDTDScannerImpl.java    16 Jan 2003 23:03:07 -0000      1.35
  +++ XMLDTDScannerImpl.java    27 Jan 2003 06:11:41 -0000      1.36
  @@ -2,7 +2,7 @@
    * The Apache Software License, Version 1.1
    *
    *
  - * Copyright (c) 1999-2002 The Apache Software Foundation.  
  + * Copyright (c) 1999-2003 The Apache Software Foundation.  
    * All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -66,10 +66,10 @@
   import org.apache.xerces.impl.msg.XMLMessageFormatter;
   
   import org.apache.xerces.util.AugmentationsImpl;
  +import org.apache.xerces.util.SymbolTable;
   import org.apache.xerces.util.XMLAttributesImpl;
   import org.apache.xerces.util.XMLChar;
   import org.apache.xerces.util.XMLStringBuffer;
  -import org.apache.xerces.util.SymbolTable;
   
   import org.apache.xerces.xni.XMLDTDContentModelHandler;
   import org.apache.xerces.xni.XMLDTDHandler;
  @@ -538,8 +538,9 @@
               if (fDTDHandler != null && !fStartDTDCalled ) {
                   fDTDHandler.startDTD(fEntityScanner, null);
               }
  -            if (fDTDHandler != null)
  -                fDTDHandler.startExternalSubset(fEntityScanner,null);
  +            if (fDTDHandler != null) {
  +                fDTDHandler.startExternalSubset(identifier,null);
  +            }
               fEntityManager.startExternalSubset();
               fExtEntityDepth++;
           }
  
  
  
  1.46      +3 -3      
xml-xerces/java/src/org/apache/xerces/impl/dtd/XMLDTDValidator.java
  
  Index: XMLDTDValidator.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dtd/XMLDTDValidator.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- XMLDTDValidator.java      23 Jan 2003 23:12:27 -0000      1.45
  +++ XMLDTDValidator.java      27 Jan 2003 06:11:41 -0000      1.46
  @@ -2,7 +2,7 @@
    * The Apache Software License, Version 1.1
    *
    *
  - * Copyright (c) 1999-2002 The Apache Software Foundation.  
  + * Copyright (c) 1999-2003 The Apache Software Foundation.  
    * All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -260,7 +260,7 @@
       protected DTDGrammarBucket fGrammarBucket;
   
       /* location of the document as passed in from startDocument call */
  -    protected XMLResourceIdentifier fDocLocation;
  +    protected XMLLocator fDocLocation;
   
       /** Namespace support. */
       protected NamespaceContext fNamespaceContext = null;
  
  
  
  1.7       +14 -3     xml-xerces/java/src/org/apache/xerces/xni/XMLLocator.java
  
  Index: XMLLocator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/xni/XMLLocator.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XMLLocator.java   24 Jan 2003 00:24:12 -0000      1.6
  +++ XMLLocator.java   27 Jan 2003 06:11:41 -0000      1.7
  @@ -68,12 +68,23 @@
    *
    * @version $Id$
    */
  -public interface XMLLocator
  -    extends XMLResourceIdentifier {
  +public interface XMLLocator {
   
       //
       // XMLLocator methods
       //
  +    
  +    /** Returns the public identifier. */
  +    public String getPublicId();
  +    
  +    /** Returns the literal system identifier. */
  +    public String getLiteralSystemId();
  +    
  +    /** Returns the base system identifier. */
  +    public String getBaseSystemId();
  +    
  +    /** Returns the expanded system identifier. */
  +    public String getExpandedSystemId();
       
       /** Returns the line number. */
       public int getLineNumber();
  
  
  

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

Reply via email to