From 1d5a23236c640abf8a45f1a168df94be8420ac92 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Thu, 27 Apr 2006 08:26:47 +0000 Subject: [PATCH] Applied patch from Ville Skytt. Changes to comments/javadoc only. Closes patch #613993. --- xsl/extensions/build.xml | 2 +- .../saxon643/com/nwalsh/saxon/CVS.java | 2 +- .../com/nwalsh/saxon/CalloutEmitter.java | 10 ++++------ .../com/nwalsh/saxon/ColumnScanEmitter.java | 4 ++-- .../com/nwalsh/saxon/ColumnUpdateEmitter.java | 4 ++-- .../saxon643/com/nwalsh/saxon/CopyEmitter.java | 2 +- .../com/nwalsh/saxon/LineCountEmitter.java | 2 +- .../com/nwalsh/saxon/NumberLinesEmitter.java | 2 +- .../saxon643/com/nwalsh/saxon/Table.java | 4 ++-- .../saxon643/com/nwalsh/saxon/Text.java | 2 +- .../saxon643/com/nwalsh/saxon/TextFactory.java | 2 +- .../saxon643/com/nwalsh/saxon/UnwrapLinks.java | 3 ++- .../saxon643/com/nwalsh/saxon/Verbatim.java | 10 +++++----- xsl/extensions/xalan2/com/nwalsh/xalan/CVS.java | 4 ++-- .../xalan2/com/nwalsh/xalan/ImageIntrinsics.java | 4 ++-- .../xalan2/com/nwalsh/xalan/Table.java | 4 ++-- xsl/extensions/xalan2/com/nwalsh/xalan/Text.java | 2 +- .../xalan2/com/nwalsh/xalan/Verbatim.java | 16 +++++----------- 18 files changed, 36 insertions(+), 43 deletions(-) diff --git a/xsl/extensions/build.xml b/xsl/extensions/build.xml index 83bac1e83..405289d5a 100644 --- a/xsl/extensions/build.xml +++ b/xsl/extensions/build.xml @@ -1,6 +1,6 @@ - + diff --git a/xsl/extensions/saxon643/com/nwalsh/saxon/CVS.java b/xsl/extensions/saxon643/com/nwalsh/saxon/CVS.java index 529546be7..ca89f39b6 100644 --- a/xsl/extensions/saxon643/com/nwalsh/saxon/CVS.java +++ b/xsl/extensions/saxon643/com/nwalsh/saxon/CVS.java @@ -17,7 +17,7 @@ import java.text.ParseException; *

Copyright (C) 2000 Norman Walsh.

* *

This class provides a - * Saxon + * Saxon * extension to turn the CVS date strings, which are UTC:

* * 
$Date: 2000/11/09 02:34:20 $
diff --git a/xsl/extensions/saxon643/com/nwalsh/saxon/CalloutEmitter.java b/xsl/extensions/saxon643/com/nwalsh/saxon/CalloutEmitter.java index 60492b06c..a61b38c3b 100644 --- a/xsl/extensions/saxon643/com/nwalsh/saxon/CalloutEmitter.java +++ b/xsl/extensions/saxon643/com/nwalsh/saxon/CalloutEmitter.java @@ -18,7 +18,7 @@ import com.icl.saxon.tree.AttributeCollection; *

Copyright (C) 2000 Norman Walsh.

* *

This class provides the guts of a - * Saxon 6.* + * Saxon 6.* * implementation of callouts for verbatim environments. (It is used * by the Verbatim class.)

* @@ -86,12 +86,11 @@ public class CalloutEmitter extends CopyEmitter { /**

Constructor for the CalloutEmitter.

* + * @param controller * @param namePool The name pool to use for constructing elements and attributes. - * @param graphicsPath The path to callout number graphics. - * @param graphicsExt The extension for callout number graphics. - * @param graphicsMax The largest callout number that can be represented as a graphic. * @param defaultColumn The default column for callouts. * @param foStylesheet Is this an FO stylesheet? + * @param fCallout */ public CalloutEmitter(Controller controller, NamePool namePool, @@ -117,8 +116,7 @@ public class CalloutEmitter extends CopyEmitter { *

This data structure is used to augment the result tree fragment * with callout bullets.

* - * @param areaspecNodeSet The source document <areaspec> element. - * + * @param areaspecNodeList The source document <areaspec> element. */ public void setupCallouts (NodeList areaspecNodeList) { callout = new Callout[10]; diff --git a/xsl/extensions/saxon643/com/nwalsh/saxon/ColumnScanEmitter.java b/xsl/extensions/saxon643/com/nwalsh/saxon/ColumnScanEmitter.java index 9c3ab88c2..6efe35aab 100644 --- a/xsl/extensions/saxon643/com/nwalsh/saxon/ColumnScanEmitter.java +++ b/xsl/extensions/saxon643/com/nwalsh/saxon/ColumnScanEmitter.java @@ -7,14 +7,14 @@ import com.icl.saxon.om.*; import com.icl.saxon.expr.FragmentValue; /** - *

Saxon extension to scan the column widthsin a result tree fragment.

+ *

Saxon extension to scan the column widths in a result tree fragment.

* *

$Id$

* *

Copyright (C) 2000 Norman Walsh.

* *

This class provides a - * Saxon 6.* + * Saxon 6.* * implementation to scan the column widths in a result tree * fragment.

* diff --git a/xsl/extensions/saxon643/com/nwalsh/saxon/ColumnUpdateEmitter.java b/xsl/extensions/saxon643/com/nwalsh/saxon/ColumnUpdateEmitter.java index 779a24750..36434caba 100644 --- a/xsl/extensions/saxon643/com/nwalsh/saxon/ColumnUpdateEmitter.java +++ b/xsl/extensions/saxon643/com/nwalsh/saxon/ColumnUpdateEmitter.java @@ -9,14 +9,14 @@ import com.icl.saxon.expr.FragmentValue; import com.icl.saxon.tree.AttributeCollection; /** - *

Saxon extension to scan the column widthsin a result tree fragment.

+ *

Saxon extension to scan the column widths in a result tree fragment.

* *

$Id$

* *

Copyright (C) 2000 Norman Walsh.

* *

This class provides a - * Saxon 6.* + * Saxon 6.* * implementation to scan the column widths in a result tree * fragment.

* diff --git a/xsl/extensions/saxon643/com/nwalsh/saxon/CopyEmitter.java b/xsl/extensions/saxon643/com/nwalsh/saxon/CopyEmitter.java index 9817796ce..3718c50d1 100644 --- a/xsl/extensions/saxon643/com/nwalsh/saxon/CopyEmitter.java +++ b/xsl/extensions/saxon643/com/nwalsh/saxon/CopyEmitter.java @@ -23,7 +23,7 @@ import com.icl.saxon.tree.*; *

Copyright (C) 2000 Norman Walsh.

* *

This class provides a - * Saxon 6.* + * Saxon 6.* * implementation of an emitter that manufactures a cloned result * tree fragment.

* diff --git a/xsl/extensions/saxon643/com/nwalsh/saxon/LineCountEmitter.java b/xsl/extensions/saxon643/com/nwalsh/saxon/LineCountEmitter.java index 5febeda3d..d8110dedb 100644 --- a/xsl/extensions/saxon643/com/nwalsh/saxon/LineCountEmitter.java +++ b/xsl/extensions/saxon643/com/nwalsh/saxon/LineCountEmitter.java @@ -14,7 +14,7 @@ import com.icl.saxon.expr.FragmentValue; *

Copyright (C) 2000 Norman Walsh.

* *

This class provides a - * Saxon 6.* + * Saxon 6.* * implementation to count the number of lines in a result tree * fragment.

* diff --git a/xsl/extensions/saxon643/com/nwalsh/saxon/NumberLinesEmitter.java b/xsl/extensions/saxon643/com/nwalsh/saxon/NumberLinesEmitter.java index ab471e045..c32efa9e3 100644 --- a/xsl/extensions/saxon643/com/nwalsh/saxon/NumberLinesEmitter.java +++ b/xsl/extensions/saxon643/com/nwalsh/saxon/NumberLinesEmitter.java @@ -19,7 +19,7 @@ import com.icl.saxon.expr.FragmentValue; *

Copyright (C) 2000 Norman Walsh.

* *

This class provides the guts of a - * Saxon 6.* + * Saxon 6.* * implementation of line numbering for verbatim environments. (It is used * by the Verbatim class.)

* diff --git a/xsl/extensions/saxon643/com/nwalsh/saxon/Table.java b/xsl/extensions/saxon643/com/nwalsh/saxon/Table.java index c49632a1e..ef23b04f7 100644 --- a/xsl/extensions/saxon643/com/nwalsh/saxon/Table.java +++ b/xsl/extensions/saxon643/com/nwalsh/saxon/Table.java @@ -22,7 +22,7 @@ import com.icl.saxon.functions.Extensions; *

Copyright (C) 2000 Norman Walsh.

* *

This class provides a - * Saxon + * Saxon * implementation of some code to adjust CALS Tables to HTML * Tables.

* @@ -287,7 +287,7 @@ public class Table { * * * @param context The stylesheet context; supplied automatically by Saxon - * @param rtf The result tree fragment containing the colgroup. + * @param rtf_ns The result tree fragment containing the colgroup. * * @return The result tree fragment containing the adjusted colgroup. * diff --git a/xsl/extensions/saxon643/com/nwalsh/saxon/Text.java b/xsl/extensions/saxon643/com/nwalsh/saxon/Text.java index 9bb6fe8c3..71ef56824 100644 --- a/xsl/extensions/saxon643/com/nwalsh/saxon/Text.java +++ b/xsl/extensions/saxon643/com/nwalsh/saxon/Text.java @@ -30,7 +30,7 @@ import org.xml.sax.AttributeList; *

Copyright (C) 2000 Norman Walsh.

* *

This class provides a - * Saxon + * Saxon * extension element for inserting text into a result tree.

* *

Change Log:

diff --git a/xsl/extensions/saxon643/com/nwalsh/saxon/TextFactory.java b/xsl/extensions/saxon643/com/nwalsh/saxon/TextFactory.java index ccf5001c0..6dc09672e 100644 --- a/xsl/extensions/saxon643/com/nwalsh/saxon/TextFactory.java +++ b/xsl/extensions/saxon643/com/nwalsh/saxon/TextFactory.java @@ -13,7 +13,7 @@ import org.xml.sax.SAXException; *

Copyright (C) 2000 Norman Walsh.

* *

This class provides a - * Saxon + * Saxon * extension element factory for the Text extension element * family.

* diff --git a/xsl/extensions/saxon643/com/nwalsh/saxon/UnwrapLinks.java b/xsl/extensions/saxon643/com/nwalsh/saxon/UnwrapLinks.java index ec1a337b1..18b6c5e15 100644 --- a/xsl/extensions/saxon643/com/nwalsh/saxon/UnwrapLinks.java +++ b/xsl/extensions/saxon643/com/nwalsh/saxon/UnwrapLinks.java @@ -95,7 +95,8 @@ public class UnwrapLinks { /** *

Unwrap links

* - * @param rtf The result tree fragment of the verbatim environment. + * @param context The current stylesheet context. + * @param rtf_ns The result tree fragment of the verbatim environment. * * @return The modified result tree fragment. */ diff --git a/xsl/extensions/saxon643/com/nwalsh/saxon/Verbatim.java b/xsl/extensions/saxon643/com/nwalsh/saxon/Verbatim.java index 9e1febfbc..2bff9a02e 100644 --- a/xsl/extensions/saxon643/com/nwalsh/saxon/Verbatim.java +++ b/xsl/extensions/saxon643/com/nwalsh/saxon/Verbatim.java @@ -25,7 +25,7 @@ import com.nwalsh.saxon.CalloutEmitter; *

Copyright (C) 2000 Norman Walsh.

* *

This class provides a - * Saxon + * Saxon * implementation of two features that would be impractical to * implement directly in XSLT: line numbering and callouts.

* @@ -231,7 +231,8 @@ public class Verbatim { * are not duplicated if the stylesheet.result.type is "html" and * 'id' attributes will not be duplicated if the result type is "fo".

* - * @param rtf The result tree fragment of the verbatim environment. + * @param context The current stylesheet context. + * @param rtf_ns The result tree fragment of the verbatim environment. * * @return The modified result tree fragment. */ @@ -457,12 +458,11 @@ public class Verbatim { * parenthesis.

* * @param context The stylesheet context. - * @param areaspecNodeSet The source node set that contains the areaspec. - * @param rtf The result tree fragment of the verbatim environment. + * @param areaspecNodeList The source node set that contains the areaspec. + * @param rtf_ns The result tree fragment of the verbatim environment. * * @return The modified result tree fragment. */ - public static NodeSetValue insertCallouts (Context context, NodeList areaspecNodeList, NodeSetValue rtf_ns) { diff --git a/xsl/extensions/xalan2/com/nwalsh/xalan/CVS.java b/xsl/extensions/xalan2/com/nwalsh/xalan/CVS.java index acf1d057a..fbd190e90 100644 --- a/xsl/extensions/xalan2/com/nwalsh/xalan/CVS.java +++ b/xsl/extensions/xalan2/com/nwalsh/xalan/CVS.java @@ -10,14 +10,14 @@ import java.text.DateFormat; import java.text.ParseException; /** - *

Saxon extension to convert CVS date strings into local time

+ *

Xalan extension to convert CVS date strings into local time

* *

$Id$

* *

Copyright (C) 2000 Norman Walsh.

* *

This class provides a - * Saxon + * Xalan * extension to turn the CVS date strings, which are UTC:

* * 
$Date: 2000/11/09 02:34:20 $
diff --git a/xsl/extensions/xalan2/com/nwalsh/xalan/ImageIntrinsics.java b/xsl/extensions/xalan2/com/nwalsh/xalan/ImageIntrinsics.java index 97a13a3a5..94f02f4c0 100644 --- a/xsl/extensions/xalan2/com/nwalsh/xalan/ImageIntrinsics.java +++ b/xsl/extensions/xalan2/com/nwalsh/xalan/ImageIntrinsics.java @@ -9,14 +9,14 @@ import java.util.StringTokenizer; import org.apache.xalan.extensions.ExpressionContext; /** - *

Saxon extension to examine intrinsic size of images

+ *

Xalan extension to examine intrinsic size of images

* *

$Id$

* *

Copyright (C) 2002 Norman Walsh.

* *

This class provides a - * Xalan + * Xalan * extension to find the intrinsic size of images.

* *

Change Log:

diff --git a/xsl/extensions/xalan2/com/nwalsh/xalan/Table.java b/xsl/extensions/xalan2/com/nwalsh/xalan/Table.java index 58b4d0b59..8e76df475 100644 --- a/xsl/extensions/xalan2/com/nwalsh/xalan/Table.java +++ b/xsl/extensions/xalan2/com/nwalsh/xalan/Table.java @@ -29,7 +29,7 @@ import org.apache.xml.utils.AttList; *

Copyright (C) 2000 Norman Walsh.

* *

This class provides a - * Xalan + * Xalan * implementation of some code to adjust CALS Tables to HTML * Tables.

* @@ -214,7 +214,7 @@ public class Table { * * * @param context The stylesheet context; supplied automatically by Xalan - * @param rtf The result tree fragment containing the colgroup. + * @param xalanNI * * @return The result tree fragment containing the adjusted colgroup. * diff --git a/xsl/extensions/xalan2/com/nwalsh/xalan/Text.java b/xsl/extensions/xalan2/com/nwalsh/xalan/Text.java index 7bbf577dc..88c9603d5 100644 --- a/xsl/extensions/xalan2/com/nwalsh/xalan/Text.java +++ b/xsl/extensions/xalan2/com/nwalsh/xalan/Text.java @@ -40,7 +40,7 @@ import javax.xml.transform.Source; *

Copyright (C) 2001 Norman Walsh.

* *

This class provides a - * Xalan + * Xalan * extension element for inserting text into a result tree.

* *

Change Log:

diff --git a/xsl/extensions/xalan2/com/nwalsh/xalan/Verbatim.java b/xsl/extensions/xalan2/com/nwalsh/xalan/Verbatim.java index 42fd74838..053063920 100644 --- a/xsl/extensions/xalan2/com/nwalsh/xalan/Verbatim.java +++ b/xsl/extensions/xalan2/com/nwalsh/xalan/Verbatim.java @@ -44,7 +44,7 @@ import com.nwalsh.xalan.Params; *

Copyright (C) 2001 Norman Walsh.

* *

This class provides a - * Xalan + * Xalan * implementation of two features that would be impractical to * implement directly in XSLT: line numbering and callouts.

* @@ -151,7 +151,8 @@ public class Verbatim { * attributes as the originals, except that 'name' and 'id' attributes * are not duplicated.

* - * @param xalanRTF The result tree fragment of the verbatim environment. + * @param context + * @param xalanNI * * @return The modified result tree fragment. */ @@ -428,19 +429,12 @@ public class Verbatim { *

Callouts are inserted before the character at the line/column * where they are to occur.

* + * @param context * @param areaspecNodeSet The source node set that contains the areaspec. - * @param xalanRTF The result tree fragment of the verbatim environment. - * @param defaultColumn The column for callouts that specify only a line. - * @param gPath The path to use for callout graphics. - * @param gExt The extension to use for callout graphics. - * @param gMax The largest number that can be represented as a graphic. - * @param useFO Should fo:external-graphics be produced, as opposed to - * HTML imgs. This is bogus, the extension should figure it out, but I - * haven't figured out how to do that yet. + * @param xalanNI * * @return The modified result tree fragment. */ - public DocumentFragment insertCallouts (ExpressionContext context, NodeIterator areaspecNodeSet, NodeIterator xalanNI) { -- 2.40.0