jkesselm 00/12/12 14:10:52
Modified: java/src/org/apache/xalan/templates Constants.java
OutputProperties.java
Log:
Declare the Extensions namespace as a URI; make it a {universal} only in the
one place where that's needed
Revision Changes Path
1.9 +1 -2
xml-xalan/java/src/org/apache/xalan/templates/Constants.java
Index: Constants.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/Constants.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Constants.java 2000/12/12 19:10:52 1.8
+++ Constants.java 2000/12/12 22:10:40 1.9
@@ -105,10 +105,9 @@
*(http://xml.apache.org/xslt) predefined to signify Xalan's
* built-in XSLT Extensions. When used in stylesheets, this is often
* bound to the "xalan:" prefix.
- * TODO: ARE THE BRACES HERE A BUG?
*/
public static final String
- S_BUILTIN_EXTENSIONS_URL = "{http://xml.apache.org/xslt}";;
+ S_BUILTIN_EXTENSIONS_URL = "http://xml.apache.org/xslt";;
/** NEEDSDOC: PARSER_PATH
*/
1.6 +12 -5
xml-xalan/java/src/org/apache/xalan/templates/OutputProperties.java
Index: OutputProperties.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/OutputProperties.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- OutputProperties.java 2000/12/09 03:47:26 1.5
+++ OutputProperties.java 2000/12/12 22:10:41 1.6
@@ -131,6 +131,13 @@
static final String S_XALAN_PREFIX = "org.apache.xslt.";
static final int S_XALAN_PREFIX_LEN = S_XALAN_PREFIX.length();
+ /** Built-in extensions namespace, reexpressed in {namespaceURI} syntax
+ * suitable for prepending to a localname to produce a "universal
+ * name".
+ */
+ static final String S_BUILTIN_EXTENSIONS_UNIVERSAL=
+ "{"+Constants.S_BUILTIN_EXTENSIONS_URL+"}";
+
/**
* Fix up a string in an output properties file according to
* the rules of [EMAIL PROTECTED] #loadPropertiesFile}.
@@ -147,7 +154,7 @@
}
if (s.startsWith(S_XALAN_PREFIX))
{
- s = Constants.S_BUILTIN_EXTENSIONS_URL +
s.substring(S_XALAN_PREFIX_LEN);
+ s = S_BUILTIN_EXTENSIONS_UNIVERSAL + s.substring(S_XALAN_PREFIX_LEN);
}
if ((index = s.indexOf("\\u003a")) > 0)
{
@@ -961,7 +968,7 @@
/** The number of whitespaces to indent by, if indent="yes". */
public static String S_KEY_INDENT_AMOUNT =
- Constants.S_BUILTIN_EXTENSIONS_URL+"indent-amount";
+ S_BUILTIN_EXTENSIONS_UNIVERSAL+"indent-amount";
/**
* Fully qualified name of class with a default constructor that
@@ -969,16 +976,16 @@
* will be sent to.
*/
public static String S_KEY_CONTENT_HANDLER =
- Constants.S_BUILTIN_EXTENSIONS_URL+"content-handler";
+ S_BUILTIN_EXTENSIONS_UNIVERSAL+"content-handler";
/** File name of file that specifies character to entity reference
mappings. */
public static String S_KEY_ENTITIES =
- Constants.S_BUILTIN_EXTENSIONS_URL+"entities";
+ S_BUILTIN_EXTENSIONS_UNIVERSAL+"entities";
/** Use a value of "yes" if the href values for HTML serialization should
* use %xx escaping. */
public static String S_USE_URL_ESCAPING =
- Constants.S_BUILTIN_EXTENSIONS_URL+"use-url-escaping";
+ S_BUILTIN_EXTENSIONS_UNIVERSAL+"use-url-escaping";
/** The default properties of all output files. */
private static Properties m_xml_properties = null;
