Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions src/main/java/eu/europa/ted/efx/interfaces/MarkupGenerator.java
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ public interface MarkupGenerator {
/**
* Returns the markup that represents a line break in the target template.
*
* For example, in EFX to XSLT, translation this would return a <br> HTML
* element if your target is rendering HTML, or an <xsl:text>&#10;</xsl:text>
* For example, in EFX to XSLT, translation this would return a {@code <br/>} HTML
* element if your target is rendering HTML, or an {@code <xsl:text>&#10;</xsl:text>}
* (which is the XSLT equivalent of a line feed) if you are not targeting HTML.
*
* @return the markup that represents a line break in the target template.
Expand Down Expand Up @@ -258,28 +258,26 @@ default Markup renderFragmentInvocation(final String name, final PathExpression
*
* The EfxTemplateTranslator will call this method to generate the
* fragment invocation code and then will pass the generated Markup to the
* {@link #renderContextLoop(String, PathExpression, Markup, Set<Argument>)}.
* {@link #renderContextLoop(PathExpression, Markup, Set)}.
Comment thread
rousso marked this conversation as resolved.
*
* In EFX to XSLT translation, this method would generate the xsl:call-template
* that will invoke the fragment.
*
* @param name the name of the fragment.
* @param context the context of the fragment.
* @param variables the variables of the fragment.
* @param arguments the arguments of the fragment.
* @return the code that invokes (uses) the fragment.
*/
Markup renderFragmentInvocation(final String name, final Set<Argument> arguments);

/**
* Given an evaluation context, and some pre-rendered content, this method returns the code that
* iterates over the context and repeats the content for each item in the context.
*
* As of version 2.0.0-alpha.4, the method composeFragmentInvocation(String, Set<Argument>)
* As of version 2.0.0-alpha.4, the method composeFragmentInvocation(String, Set)
* has been split into two methods:
* 1. {@link #renderFragmentInvocation(String, Set<Argument>)}
* 1. {@link #renderFragmentInvocation(String, Set)}
* for rendering the fragment invocation itself, which is the used by the
* context loop.
* 2. {@link #renderContextLoop(PathExpression, Markup, Set<Argument>)}
* 2. {@link #renderContextLoop(PathExpression, Markup, Set)}
* for rendering the context loop that invokes the fragment.
*
* The EfxTemplateTranslator will call these two methods in sequence to generate the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ static <T extends PathExpression> T from(TypedExpression source, Class<T> return

/**
* A base class for {@link PathExpression} implementations.
*
* @param <T> the EFX data type for the expression.
*/
@EfxExpressionTypeAssociation(expressionType = EfxExpressionType.Path.class)
public abstract class Impl<T extends EfxDataType> extends TypedExpression.Impl<T>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ static ScalarExpression instantiate(String script, Class<? extends EfxDataType>

/**
* A base class for {@link ScalarExpression} implementations.
*
* @param <T> the EFX data type for the expression.
*/
@EfxExpressionTypeAssociation(expressionType = EfxExpressionType.Scalar.class)
public abstract class Impl<T extends EfxDataType> extends TypedExpression.Impl<T>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ static SequenceExpression instantiate(String script, Class<? extends EfxDataType

/**
* A base class for {@link SequenceExpression} implementations.
*
* @param <T> the data type of the sequence expression result
*/
@EfxExpressionTypeAssociation(expressionType = EfxExpressionType.Sequence.class)
public abstract class Impl<T extends EfxDataType> extends TypedExpression.Impl<T>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@ public void pushChild(final int number, final Context context, final Variables v
* sibling is later removed, their parent block will return to the top of the stack again.
*
* @param number the outline number of the sibling block.
* @param context the context of the sibling block.
* @param variables the variables of the sibling block.
* @param defaultContent the content of the sibling block.
* @param context the context of the sibling block.
* @param variables the variables of the sibling block.
* @param conditionals the conditionals of the sibling block.
* @param defaultContent the content of the sibling block.
*/
public void pushSibling(final int number, Context context, final Variables variables, final Conditionals conditionals,
final Markup defaultContent) {
Expand Down