Reformulate StatementContextFactory.createEffective()

[yangtools.git] / yang / rfc6643-parser-support / src / main / java / org / opendaylight / yangtools / rfc6643 / parser / SubIdStatementSupport.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementSupport.java b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementSupport.java
index f614f33d96a1ac478f6a1c6e97ed8567fd0197ac..3b782e4966cb89698c84eee121695b577690e4a1 100644 (file)
--- a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementSupport.java
+++ b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementSupport.java
@@ -16,6 +16,7 @@ import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseStatementSupport;
+import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 
@@ -56,15 +57,8 @@ public final class SubIdStatementSupport
     }
 
     @Override
-    protected SubIdEffectiveStatement createEffective(
-            final StmtContext<Uint32, SubIdStatement, SubIdEffectiveStatement> ctx,
-            final SubIdStatement declared, final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-        return new SubIdEffectiveStatementImpl(declared, substatements, ctx);
-    }
-
-    @Override
-    protected SubIdEffectiveStatement createEmptyEffective(
-            final StmtContext<Uint32, SubIdStatement, SubIdEffectiveStatement> ctx, final SubIdStatement declared) {
-        return createEffective(ctx, declared, ImmutableList.of());
+    protected SubIdEffectiveStatement createEffective(final Current<Uint32, SubIdStatement> stmt,
+            final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+        return new SubIdEffectiveStatementImpl(stmt, substatements);
     }
 }