garyp 00/11/10 01:33:05
Modified: java/src/org/apache/xalan/templates StylesheetRoot.java
Log:
Correct and cleanup recomposeImports() to generate m_globalImportList with
correct precedence.
Revision Changes Path
1.19 +4 -23
xml-xalan/java/src/org/apache/xalan/templates/StylesheetRoot.java
Index: StylesheetRoot.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/StylesheetRoot.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- StylesheetRoot.java 2000/11/09 18:31:22 1.18
+++ StylesheetRoot.java 2000/11/10 09:33:04 1.19
@@ -410,8 +410,7 @@
* list. The will be added from highest import precedence to
* least import precidence.
*
- * NEEDSDOC @param stylesheet
- * NEEDSDOC @param addToList
+ * @param stylesheet Stylesheet to examine for imports.
*/
protected void addImports(Stylesheet stylesheet, boolean addToList)
{
@@ -425,8 +424,7 @@
{
Stylesheet imported = stylesheet.getImport(i);
- m_globalImportList.insertElementAt(imported, 0);
- addImports(imported, false);
+ addImports(imported, true);
}
}
@@ -444,6 +442,7 @@
if (addToList)
m_globalImportList.insertElementAt(stylesheet, 0);
+
}
/**
@@ -462,26 +461,8 @@
if (null == m_globalImportList)
{
m_globalImportList = new Vector();
-
- int n = getImportCount();
-
- for (int i = 0; i < n; i++)
- {
- StylesheetComposed imported = getImport(i);
-
- addImports(imported, true);
- }
-
- n = getIncludeCount();
-
- for (int i = 0; i < n; i++)
- {
- Stylesheet included = getInclude(i);
-
- addImports(included, false);
- }
- m_globalImportList.insertElementAt(this, 0);
+ addImports(this, true);
}
super.recomposeImports();
