You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by an...@locus.apache.org on 2000/10/06 23:50:22 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/impl Constants.java XMLDTDScanner.java XMLDocumentScanner.java XMLEntityManager.java XMLErrorReporter.java XMLScanner.java
andyc 00/10/06 14:50:22
Modified: java/src/org/apache/xerces/impl Tag: xerces_j_2
XMLDTDScanner.java XMLDocumentScanner.java
XMLEntityManager.java XMLErrorReporter.java
XMLScanner.java
Added: java/src/org/apache/xerces/impl Tag: xerces_j_2
Constants.java
Log:
Moved common constants for feature and property identifiers
to a separate class and updated the implementation to use
these constants. I thought about making them the constants
and interface but that would add all those strings to
every class even if it didn't need to use any of them. As
a class, only those strings that are needed by each class
will be compiled into the byte codes.
The Constants class has a way of querying the SAX and Xerces
features and properties. In addition, it has a main function
which will print the complete list to the standard output.
Neat! :)
Revision Changes Path
No revision
No revision
1.1.2.5 +3 -3 xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLDTDScanner.java
Index: XMLDTDScanner.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLDTDScanner.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- XMLDTDScanner.java 2000/10/02 23:19:09 1.1.2.4
+++ XMLDTDScanner.java 2000/10/06 21:50:20 1.1.2.5
@@ -79,11 +79,11 @@
/**
* @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
- * @version $Id: XMLDTDScanner.java,v 1.1.2.4 2000/10/02 23:19:09 andyc Exp $
+ * @version $Id: XMLDTDScanner.java,v 1.1.2.5 2000/10/06 21:50:20 andyc Exp $
*/
public class XMLDTDScanner
- implements XMLComponent, XMLDTDSource, XMLDTDContentModelSource,
- XMLEntityHandler {
+ implements XMLComponent,
+ XMLDTDSource, XMLDTDContentModelSource, XMLEntityHandler {
//
// Data
1.1.2.14 +11 -28 xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLDocumentScanner.java
Index: XMLDocumentScanner.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLDocumentScanner.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- XMLDocumentScanner.java 2000/10/06 18:22:48 1.1.2.13
+++ XMLDocumentScanner.java 2000/10/06 21:50:20 1.1.2.14
@@ -100,7 +100,7 @@
* @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
* @author Andy Clark, IBM
*
- * @version $Id: XMLDocumentScanner.java,v 1.1.2.13 2000/10/06 18:22:48 andyc Exp $
+ * @version $Id: XMLDocumentScanner.java,v 1.1.2.14 2000/10/06 21:50:20 andyc Exp $
*/
public class XMLDocumentScanner
extends XMLScanner
@@ -110,28 +110,6 @@
// Constants
//
- // sax features
-
- /** SAX feature prefix. */
- protected static final String SAX_FEATURE_PREFIX = "http://xml.org/sax/features/";
-
- /** Namespaces feature. */
- protected static final String NAMESPACES_FEATURE = "namespaces";
-
- // xerces properties
-
- /** Xerces property prefix. */
- protected static final String XERCES_PROPERTY_PREFIX = "http://apache.org/xml/properties/";
-
- /** Symbol table property. */
- protected static final String SYMBOL_TABLE_PROPERTY = "internal/symbol-table";
-
- /** Error reporter property. */
- protected static final String ERROR_REPORTER_PROPERTY = "internal/error-reporter";
-
- /** Entity manager property. */
- protected static final String ENTITY_MANAGER_PROPERTY = "internal/entity-manager";
-
// scanner states
/** Scanner state: XML declaration. */
@@ -370,15 +348,20 @@
throws SAXException {
// SAX features
- fNamespaces = componentManager.getFeature(SAX_FEATURE_PREFIX + NAMESPACES_FEATURE);
+ final String NAMESPACES = Constants.SAX_FEATURE_PREFIX + Constants.NAMESPACES_FEATURE;
+ fNamespaces = componentManager.getFeature(NAMESPACES);
fAttributes.setNamespaces(fNamespaces);
// Xerces properties
- fSymbolTable = (SymbolTable)componentManager.getProperty(XERCES_PROPERTY_PREFIX + SYMBOL_TABLE_PROPERTY);
- fErrorReporter = (XMLErrorReporter)componentManager.getProperty(XERCES_PROPERTY_PREFIX + ERROR_REPORTER_PROPERTY);
- fEntityManager = (XMLEntityManager)componentManager.getProperty(XERCES_PROPERTY_PREFIX + ENTITY_MANAGER_PROPERTY);
+ final String SYMBOL_TABLE = Constants.XERCES_PROPERTY_PREFIX + Constants.SYMBOL_TABLE_PROPERTY;
+ fSymbolTable = (SymbolTable)componentManager.getProperty(SYMBOL_TABLE);
+ final String ERROR_REPORTER = Constants.XERCES_PROPERTY_PREFIX + Constants.ERROR_REPORTER_PROPERTY;
+ fErrorReporter = (XMLErrorReporter)componentManager.getProperty(ERROR_REPORTER);
+ final String ENTITY_MANAGER = Constants.XERCES_PROPERTY_PREFIX + Constants.ENTITY_MANAGER_PROPERTY;
+ fEntityManager = (XMLEntityManager)componentManager.getProperty(ENTITY_MANAGER);
/*** REVISIT: Add DTD support. ***
- fDTDScanner = (XMLDTDScanner)componentManager.getProperty(XERCES_PROPERTY_PREFIX + DTD_SCANNER_PROPERTY);
+ final String DTD_SCANNER = Constants.XERCES_PROPERTY_PREFIX + Constants.DTD_SCANNER_PROPERTY;
+ fDTDScanner = (XMLDTDScanner)componentManager.getProperty(DTD_SCANNER);
/***/
// initialize scanner
1.1.2.9 +10 -26 xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLEntityManager.java
Index: XMLEntityManager.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLEntityManager.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- XMLEntityManager.java 2000/10/06 18:22:48 1.1.2.8
+++ XMLEntityManager.java 2000/10/06 21:50:21 1.1.2.9
@@ -105,7 +105,7 @@
* @author Stubs generated by DesignDoc on Mon Sep 18 18:23:16 PDT 2000
* @author Andy Clark, IBM
*
- * @version $Id: XMLEntityManager.java,v 1.1.2.8 2000/10/06 18:22:48 andyc Exp $
+ * @version $Id: XMLEntityManager.java,v 1.1.2.9 2000/10/06 21:50:21 andyc Exp $
*/
public class XMLEntityManager
implements XMLComponent {
@@ -117,27 +117,8 @@
/** Default buffer size (2048). */
public static final int DEFAULT_BUFFER_SIZE = 2048;
- // xerces features
-
- /** Xerces feature prefix. */
- //protected static final String XERCES_FEATURE_PREFIX = "http://apache.org/xml/features/";
-
- // xerces properties
-
- /** Xerces property prefix. */
- protected static final String XERCES_PROPERTY_PREFIX = "http://apache.org/xml/properties/";
-
- /** Entity resolver property id. */
- protected static final String ENTITY_RESOLVER_PROPERTY = "internal/entity-resolver";
-
- /** Symbol table property id. */
- protected static final String SYMBOL_TABLE_PROPERTY = "internal/symbol-table";
-
// debugging
- /** Debugging. */
- private static final boolean DEBUG = false;
-
/**
* Debug printing of buffer. This debugging flag works best when you
* resize the DEFAULT_BUFFER_SIZE down to something reasonable like
@@ -145,6 +126,9 @@
*/
private static final boolean DEBUG_PRINT = false;
+ /** Debugging. */
+ private static final boolean DEBUG = false;
+
//
// Data
//
@@ -353,9 +337,9 @@
throws SAXException {
// Xerces properties
- final String ENTITY_RESOLVER = XERCES_PROPERTY_PREFIX + ENTITY_RESOLVER_PROPERTY;
+ final String ENTITY_RESOLVER = Constants.XERCES_PROPERTY_PREFIX + Constants.ENTITY_RESOLVER_PROPERTY;
fEntityResolver = (EntityResolver)componentManager.getProperty(ENTITY_RESOLVER);
- final String SYMBOL_TABLE = XERCES_PROPERTY_PREFIX + SYMBOL_TABLE_PROPERTY;
+ final String SYMBOL_TABLE = Constants.XERCES_PROPERTY_PREFIX + Constants.SYMBOL_TABLE_PROPERTY;
fSymbolTable = (SymbolTable)componentManager.getProperty(SYMBOL_TABLE);
// initialize state
@@ -384,13 +368,13 @@
throws SAXNotRecognizedException, SAXNotSupportedException {
// Xerces properties
- if (propertyId.startsWith(XERCES_PROPERTY_PREFIX)) {
- String property = propertyId.substring(XERCES_PROPERTY_PREFIX.length());
- if (property.equals(ENTITY_RESOLVER_PROPERTY)) {
+ if (propertyId.startsWith(Constants.XERCES_PROPERTY_PREFIX)) {
+ String property = propertyId.substring(Constants.XERCES_PROPERTY_PREFIX.length());
+ if (property.equals(Constants.ENTITY_RESOLVER_PROPERTY)) {
fEntityResolver = (EntityResolver)value;
return;
}
- if (property.equals(SYMBOL_TABLE_PROPERTY)) {
+ if (property.equals(Constants.SYMBOL_TABLE_PROPERTY)) {
fSymbolTable = (SymbolTable)value;
return;
}
1.1.2.4 +9 -17 xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLErrorReporter.java
Index: XMLErrorReporter.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLErrorReporter.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XMLErrorReporter.java 2000/10/04 20:45:35 1.1.2.3
+++ XMLErrorReporter.java 2000/10/06 21:50:21 1.1.2.4
@@ -72,7 +72,7 @@
/**
* @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
* @author Eric Ye, IBM
- * @version $Id: XMLErrorReporter.java,v 1.1.2.3 2000/10/04 20:45:35 ericye Exp $
+ * @version $Id: XMLErrorReporter.java,v 1.1.2.4 2000/10/06 21:50:21 andyc Exp $
*/
public class XMLErrorReporter
implements XMLComponent {
@@ -90,15 +90,6 @@
/** SEVERITY_FATAL_ERROR */
public static final short SEVERITY_FATAL_ERROR = -1;
-
- /** Xerces features prefix. */
- protected static final String XERCES_FEATURES_PREFIX =
- "http://apache.org/xml/features/";
-
- /** Xerces properties prefix. */
- protected static final String XERCES_PROPERTIES_PREFIX =
- "http://apache.org/xml/properties/";
-
//
// Data
//
@@ -231,7 +222,8 @@
*/
public void reset(XMLComponentManager componentManager)
throws SAXException {
- fErrorHandler = (ErrorHandler)componentManager.getProperty(XERCES_PROPERTIES_PREFIX + "internal/error-handler");
+ final String ERROR_HANDLER = Constants.XERCES_PROPERTY_PREFIX + Constants.ERROR_HANDLER_PROPERTY;
+ fErrorHandler = (ErrorHandler)componentManager.getProperty(ERROR_HANDLER);
} // reset
/**
@@ -242,15 +234,15 @@
*/
public void setFeature(String featureId, boolean state)
throws SAXNotRecognizedException, SAXNotSupportedException {
- if (featureId.startsWith(XERCES_FEATURES_PREFIX)) {
+ if (featureId.startsWith(Constants.XERCES_FEATURE_PREFIX)) {
String feature =
- featureId.substring(XERCES_FEATURES_PREFIX.length());
+ featureId.substring(Constants.XERCES_FEATURE_PREFIX.length());
//
// http://apache.org/xml/features/continue-after-fatal-error
// Allows the parser to continue after a fatal error.
// Normally, a fatal error would stop the parse.
//
- if (feature.equals("continue-after-fatal-error")) {
+ if (feature.equals(Constants.CONTINUE_AFTER_FATAL_ERROR_FEATURE)) {
fContinueAfterFatalError = state;
}
}
@@ -265,11 +257,11 @@
public void setProperty(String propertyId, Object value)
throws SAXNotRecognizedException, SAXNotSupportedException {
- if (propertyId.startsWith(XERCES_PROPERTIES_PREFIX)) {
+ if (propertyId.startsWith(Constants.XERCES_PROPERTY_PREFIX)) {
String property =
- propertyId.substring(XERCES_PROPERTIES_PREFIX.length());
+ propertyId.substring(Constants.XERCES_PROPERTY_PREFIX.length());
- if (property.equals("internal/error-handler")) {
+ if (property.equals(Constants.ERROR_HANDLER_PROPERTY)) {
fErrorHandler = (ErrorHandler) value;
}
}
1.1.2.4 +4 -2 xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLScanner.java
Index: XMLScanner.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLScanner.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XMLScanner.java 2000/10/06 03:49:34 1.1.2.3
+++ XMLScanner.java 2000/10/06 21:50:21 1.1.2.4
@@ -65,6 +65,7 @@
import org.apache.xerces.impl.msg.XMLMessageFormatter;
import org.apache.xerces.util.XMLStringBuffer;
import org.apache.xerces.util.XMLChar;
+import org.apache.xerces.xni.XMLComponent;
import org.apache.xerces.xni.XMLString;
import org.xml.sax.SAXException;
@@ -79,9 +80,10 @@
* @author Andy Clark, IBM
* @author Arnaud Le Hors, IBM
*
- * @version $Id: XMLScanner.java,v 1.1.2.3 2000/10/06 03:49:34 andyc Exp $
+ * @version $Id: XMLScanner.java,v 1.1.2.4 2000/10/06 21:50:21 andyc Exp $
*/
-public abstract class XMLScanner {
+public abstract class XMLScanner
+ implements XMLComponent {
//
// Data
No revision
No revision
1.1.2.1 +360 -0 xml-xerces/java/src/org/apache/xerces/impl/Attic/Constants.java