You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by ga...@locus.apache.org on 2000/12/03 20:27:26 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/templates DecimalFormatProperties.java NamespaceAlias.java StylesheetComposed.java
garyp 00/12/03 11:27:26
Modified: java/src/org/apache/xalan/templates
DecimalFormatProperties.java NamespaceAlias.java
StylesheetComposed.java
Log:
Remove Recomposable classes where possible.
Revision Changes Path
1.8 +1 -16 xml-xalan/java/src/org/apache/xalan/templates/DecimalFormatProperties.java
Index: DecimalFormatProperties.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/DecimalFormatProperties.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DecimalFormatProperties.java 2000/11/30 09:57:32 1.7
+++ DecimalFormatProperties.java 2000/12/03 19:27:25 1.8
@@ -93,7 +93,7 @@
* </pre>
* @see <a href="http://www.w3.org/TR/xslt#format-number">format-number in XSLT Specification</a>
*/
-public class DecimalFormatProperties implements RecomposableBase
+public class DecimalFormatProperties extends ElemTemplateElement
{
/** NEEDSDOC Field m_dfs */
@@ -413,21 +413,6 @@
public char getPatternSeparator()
{
return m_dfs.getPatternSeparator();
- }
-
- /**
- * The document order number, analogous to the same field in an ElemTemplateElement.
- */
- protected int m_docOrderNumber;
-
- /**
- * Get the UID (document order index).
- *
- * @return Index of this child
- */
- public int getUid()
- {
- return m_docOrderNumber;
}
/**
1.5 +0 -15 xml-xalan/java/src/org/apache/xalan/templates/NamespaceAlias.java
Index: NamespaceAlias.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/NamespaceAlias.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NamespaceAlias.java 2000/12/01 17:50:17 1.4
+++ NamespaceAlias.java 2000/12/03 19:27:25 1.5
@@ -176,21 +176,6 @@
}
/**
- * The document order number, analogous to the same field in an ElemTemplateElement.
- */
- protected int m_docOrderNumber;
-
- /**
- * Get the UID (document order index).
- *
- * @return Index of this child
- */
- public int getUid()
- {
- return m_docOrderNumber;
- }
-
- /**
* This function is called to recompose() all of the namespace alias properties elements.
*/
public void recompose(StylesheetRoot root)
1.21 +2 -4 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- StylesheetComposed.java 2000/11/30 09:57:32 1.20
+++ StylesheetComposed.java 2000/12/03 19:27:25 1.21
@@ -166,8 +166,7 @@
s = included.getDecimalFormatCount();
for (int j = 0; j < s; j++)
{
- DecimalFormatProperties dfp = included.getDecimalFormat(j);
- recomposableElements.addElement(new RecomposableImpl(this, dfp.getUid(), dfp));
+ recomposableElements.addElement(included.getDecimalFormat(j));
}
// Now the keys
@@ -183,8 +182,7 @@
s = included.getNamespaceAliasCount();
for (int j = 0; j < s; j++)
{
- NamespaceAlias nsa = included.getNamespaceAlias(j);
- recomposableElements.addElement(new RecomposableImpl(this, nsa.getUid(), nsa));
+ recomposableElements.addElement(included.getNamespaceAlias(j));
}
// Next comes the templates