};
private final List<? extends EffectiveStatement<?, ?>> substatements;
- private final List<StatementContextBase<?, ?, ?>> unknownSubstatementsToBuild;
-
- protected EffectiveStatementBase(final StmtContext<A, D, ?> ctx) {
- this(ctx, true);
- }
/**
* Constructor.
*
* @param ctx
* context of statement.
- * @param buildUnknownSubstatements
- * if it is false, the unknown substatements are omitted from
- * build of effective substatements till the call of either
- * effectiveSubstatements or getOmittedUnknownSubstatements
- * method. The main purpose of this is to allow the build of
- * recursive extension definitions.
*/
- protected EffectiveStatementBase(final StmtContext<A, D, ?> ctx, boolean buildUnknownSubstatements) {
-
+ protected EffectiveStatementBase(final StmtContext<A, D, ?> ctx) {
final Collection<StatementContextBase<?, ?, ?>> effectiveSubstatements = ctx.effectiveSubstatements();
final Collection<StatementContextBase<?, ?, ?>> substatementsInit = new ArrayList<>();
}
substatementsInit.addAll(effectiveSubstatements);
- Collection<StatementContextBase<?, ?, ?>> substatementsToBuild = Collections2.filter(substatementsInit,
- IS_SUPPORTED_TO_BUILD_EFFECTIVE);
- if (!buildUnknownSubstatements) {
- this.unknownSubstatementsToBuild = ImmutableList.copyOf(Collections2.filter(substatementsToBuild,
- IS_UNKNOWN_STATEMENT_CONTEXT));
- substatementsToBuild = Collections2.filter(substatementsToBuild,
- Predicates.not(IS_UNKNOWN_STATEMENT_CONTEXT));
- } else {
- this.unknownSubstatementsToBuild = ImmutableList.of();
- }
-
- this.substatements = ImmutableList.copyOf(Collections2.transform(substatementsToBuild,
- StmtContextUtils.buildEffective()));
- }
-
- Collection<EffectiveStatement<?, ?>> getOmittedUnknownSubstatements() {
- return Collections2.transform(unknownSubstatementsToBuild,
- StmtContextUtils.buildEffective());
+ this.substatements = ImmutableList.copyOf(Collections2.transform(Collections2.filter(substatementsInit,
+ IS_SUPPORTED_TO_BUILD_EFFECTIVE), StmtContextUtils.buildEffective()));
}
@Override
@Override
public final Collection<? extends EffectiveStatement<?, ?>> effectiveSubstatements() {
- if (unknownSubstatementsToBuild.isEmpty()) {
- return substatements;
- } else {
- return ImmutableList.copyOf(Iterables.concat(substatements, getOmittedUnknownSubstatements()));
- }
+ return substatements;
}
protected final <S extends EffectiveStatement<?, ?>> S firstEffective(final Class<S> type) {