garyp 00/12/06 16:59:40
Modified: java/src/org/apache/xalan/templates ElemTemplateElement.java
OutputProperties.java StylesheetComposed.java
StylesheetRoot.java
Removed: java/src/org/apache/xalan/templates Recomposable.java
RecomposableBase.java RecomposableImpl.java
Log:
Remove Recomposable family of classes. They are no longer needed
since all recomposable elements now extend ElemTemplateElement.
Revision Changes Path
1.30 +2 -2
xml-xalan/java/src/org/apache/xalan/templates/ElemTemplateElement.java
Index: ElemTemplateElement.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemTemplateElement.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ElemTemplateElement.java 2000/12/06 05:52:41 1.29
+++ ElemTemplateElement.java 2000/12/07 00:59:36 1.30
@@ -105,7 +105,7 @@
* @see Stylesheet
*/
public class ElemTemplateElement extends UnImplNode
- implements PrefixResolver, Serializable, SourceLocator, Recomposable
+ implements PrefixResolver, Serializable, SourceLocator
{
/**
@@ -1177,7 +1177,7 @@
*/
public int compareTo(Object o) throws ClassCastException {
- Recomposable ro = (Recomposable) o;
+ ElemTemplateElement ro = (ElemTemplateElement) o;
int roPrecedence = ro.getStylesheetComposed().getImportCountComposed();
int myPrecedence = this.getStylesheetComposed().getImportCountComposed();
1.3 +1 -1
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OutputProperties.java 2000/12/07 00:38:20 1.2
+++ OutputProperties.java 2000/12/07 00:59:36 1.3
@@ -89,7 +89,7 @@
* @
*/
public class OutputProperties extends ElemTemplateElement
- implements RecomposableBase, Cloneable
+ implements Cloneable
{
/**
1.24 +2 -8
xml-xalan/java/src/org/apache/xalan/templates/StylesheetComposed.java
Index: StylesheetComposed.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/StylesheetComposed.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- StylesheetComposed.java 2000/12/06 05:52:41 1.23
+++ StylesheetComposed.java 2000/12/07 00:59:38 1.24
@@ -119,14 +119,8 @@
/**
* Adds all recomposable values for this precedence level into the
recomposableElements Vector
* that was passed in as the first parameter. All elements added to the
- * recomposableElements vector should implement the Recomposable
interface. That is,
- * we must be able to determine the precedence level and document order
sequence. Also,
- * they must have a compareTo method so that we can sort the Vector
members according
- * to precedence and document order. If the value to be added does not
implement
- * Recomposable, then it must at least implement RecomposableBase. In
that case,
- * we wrap it in a RecomposableImpl object that adds the precedence and
document order
- * features.
- * @param recomposableElements a Vector of Recomposable objects that we
will add all of
+ * recomposableElements vector should extend ElemTemplateElement.
+ * @param recomposableElements a Vector of ElemTemplateElement objects
that we will add all of
* our recomposable objects to.
*/
public void recompose(Vector recomposableElements) throws
TransformerException
1.31 +6 -6
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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- StylesheetRoot.java 2000/12/06 05:52:40 1.30
+++ StylesheetRoot.java 2000/12/07 00:59:38 1.31
@@ -262,7 +262,7 @@
// appropriate routine here to actually do the recomposition.
// Note that we're going backwards, encountering the highest precedence
items first.
for (int i = recomposableElements.size() - 1; i >= 0; i--)
- ((Recomposable) recomposableElements.elementAt(i)).recompose(this);
+ ((ElemTemplateElement)
recomposableElements.elementAt(i)).recompose(this);
// Need final composition of TemplateList. This adds the wild cards
onto the chains.
m_templateList.compose();
@@ -951,7 +951,7 @@
* left and highest index or right. The first time you call
* this function it will be with the parameters 0, a.length - 1.
*
- * @param v a vector of Recomposable elements
+ * @param v a vector of ElemTemplateElement elements
* @param lo0 left boundary of partition
* @param hi0 right boundary of partition
*
@@ -966,28 +966,28 @@
{
// Arbitrarily establishing partition element as the midpoint of
// the array.
- Recomposable midNode = (Recomposable) v.elementAt( ( lo0 + hi0 ) / 2
);
+ ElemTemplateElement midNode = (ElemTemplateElement) v.elementAt( (
lo0 + hi0 ) / 2 );
// loop through the array until indices cross
while( lo <= hi )
{
// find the first element that is greater than or equal to
// the partition element starting from the left Index.
- while( (lo < hi0) && (((Recomposable)
v.elementAt(lo)).compareTo(midNode) < 0) )
+ while( (lo < hi0) && (((ElemTemplateElement)
v.elementAt(lo)).compareTo(midNode) < 0) )
{
++lo;
} // end while
// find an element that is smaller than or equal to
// the partition element starting from the right Index.
- while( (hi > lo0) && (((Recomposable)
v.elementAt(hi)).compareTo(midNode) > 0) ) {
+ while( (hi > lo0) && (((ElemTemplateElement)
v.elementAt(hi)).compareTo(midNode) > 0) ) {
--hi;
}
// if the indexes have not crossed, swap
if( lo <= hi )
{
- Recomposable node = (Recomposable) v.elementAt(lo);
+ ElemTemplateElement node = (ElemTemplateElement) v.elementAt(lo);
v.setElementAt(v.elementAt(hi), lo);
v.setElementAt(node, hi);
