You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xindice-dev@xml.apache.org by jb...@apache.org on 2002/11/18 17:16:50 UTC

cvs commit: xml-xindice/java/src/org/apache/xindice/xml/sax SAXEventGenerator.java

jbates      2002/11/18 08:16:50

  Modified:    java/src/org/apache/xindice/client/xmldb/resources
                        XMLResourceImpl.java
               java/src/org/apache/xindice/core Database.java
               java/src/org/apache/xindice/xml/sax SAXEventGenerator.java
  Log:
  fixed typing error in SAX feature name
  
  Revision  Changes    Path
  1.11      +7 -7      xml-xindice/java/src/org/apache/xindice/client/xmldb/resources/XMLResourceImpl.java
  
  Index: XMLResourceImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-xindice/java/src/org/apache/xindice/client/xmldb/resources/XMLResourceImpl.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- XMLResourceImpl.java	3 Nov 2002 08:38:36 -0000	1.10
  +++ XMLResourceImpl.java	18 Nov 2002 16:16:50 -0000	1.11
  @@ -113,8 +113,8 @@
        *
        * @see <a href="http://sax.sourceforge.net/?selected=namespaces">sax.sourceforge.net/?selected=namespaces</a>
        */
  -    public static final String SAX_NAMESPACES_PREFIXES_FEATURE
  -        = SAXEventGenerator.SAX_NAMESPACES_PREFIXES_FEATURE;
  +    public static final String SAX_NAMESPACE_PREFIXES_FEATURE
  +        = SAXEventGenerator.SAX_NAMESPACE_PREFIXES_FEATURE;
   
       /* Is the SAX namespaces feature turned on for this generator? */
       private boolean hasSaxNamespaces = true;
  @@ -190,7 +190,7 @@
          if (SAX_NAMESPACES_FEATURE.equals(feature)) {
   
              hasSaxNamespaces = value;
  -       } else if (SAX_NAMESPACES_PREFIXES_FEATURE.equals(feature)) {
  +       } else if (SAX_NAMESPACE_PREFIXES_FEATURE.equals(feature)) {
   
              hasSaxNamespacesPrefixes = value;
          }
  @@ -210,7 +210,7 @@
         if (SAX_NAMESPACES_FEATURE.equals(feature)) {
   
              return hasSaxNamespaces;
  -       } else if (SAX_NAMESPACES_PREFIXES_FEATURE.equals(feature)) {
  +       } else if (SAX_NAMESPACE_PREFIXES_FEATURE.equals(feature)) {
   
              return hasSaxNamespacesPrefixes;
          } else {
  @@ -394,7 +394,7 @@
               SAXEventGenerator events = new SAXEventGenerator(symbols, bytes);
   
               events.setFeature(SAX_NAMESPACES_FEATURE, hasSaxNamespaces);
  -            events.setFeature(SAX_NAMESPACES_PREFIXES_FEATURE,
  +            events.setFeature(SAX_NAMESPACE_PREFIXES_FEATURE,
                       hasSaxNamespacesPrefixes);
               events.setContentHandler(handler);
   
  @@ -408,7 +408,7 @@
               XMLReader xr = sp.getXMLReader();
   
               xr.setFeature(SAX_NAMESPACES_FEATURE, hasSaxNamespaces);
  -            xr.setFeature(SAX_NAMESPACES_PREFIXES_FEATURE,
  +            xr.setFeature(SAX_NAMESPACE_PREFIXES_FEATURE,
                       hasSaxNamespacesPrefixes);
               xr.setContentHandler(handler);
               
  
  
  
  1.14      +2 -2      xml-xindice/java/src/org/apache/xindice/core/Database.java
  
  Index: Database.java
  ===================================================================
  RCS file: /home/cvs/xml-xindice/java/src/org/apache/xindice/core/Database.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Database.java	5 Nov 2002 05:55:48 -0000	1.13
  +++ Database.java	18 Nov 2002 16:16:50 -0000	1.14
  @@ -84,7 +84,7 @@
      private static final String QUERYENGINE = "queryengine";
      private static final String DATABASE = "database";
      private static final String COLKEY = "database.xml";
  -   private static final String NAME = "name";
  +   public static final String NAME = "name";
   
      private static Log log = LogFactory.getLog("org.apache.xindice.core");
   
  
  
  
  1.14      +5 -5      xml-xindice/java/src/org/apache/xindice/xml/sax/SAXEventGenerator.java
  
  Index: SAXEventGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-xindice/java/src/org/apache/xindice/xml/sax/SAXEventGenerator.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- SAXEventGenerator.java	4 Nov 2002 06:39:55 -0000	1.13
  +++ SAXEventGenerator.java	18 Nov 2002 16:16:50 -0000	1.14
  @@ -103,7 +103,7 @@
        * @see <a href="http://sax.sourceforge.net/?selected=namespaces">sax.sourceforge.net/?selected=namespaces</a>
        */
       public static final String SAX_NAMESPACES_FEATURE
  -        = "http://xml.org/sax/features/namespace";
  +        = "http://xml.org/sax/features/namespaces";
   
       /**
        * This is a SAX feature that controls how namespaces are reported in SAX.
  @@ -111,7 +111,7 @@
        *
        * @see <a href="http://sax.sourceforge.net/?selected=namespaces">sax.sourceforge.net/?selected=namespaces</a>
        */
  -    public static final String SAX_NAMESPACES_PREFIXES_FEATURE
  +    public static final String SAX_NAMESPACE_PREFIXES_FEATURE
           = "http://xml.org/sax/features/namespace-prefixes";
   
       /* Is the SAX namespaces feature turned on for this generator? */
  @@ -187,7 +187,7 @@
         if (SAX_NAMESPACES_FEATURE.equals(name)) {
   
             return hasSaxNamespaces;
  -      } else if (SAX_NAMESPACES_PREFIXES_FEATURE.equals(name)) {
  +      } else if (SAX_NAMESPACE_PREFIXES_FEATURE.equals(name)) {
   
             return hasSaxNamespacesPrefixes;
         } else {
  @@ -209,7 +209,7 @@
         if (SAX_NAMESPACES_FEATURE.equals(name)) {
   
             hasSaxNamespaces = value;
  -      } else if (SAX_NAMESPACES_PREFIXES_FEATURE.equals(name)) {
  +      } else if (SAX_NAMESPACE_PREFIXES_FEATURE.equals(name)) {
   
             hasSaxNamespacesPrefixes = value;
         }