Reformulate StatementContextFactory.createEffective()

[yangtools.git] / yang / yang-parser-rfc7950 / src / main / java / org / opendaylight / yangtools / yang / parser / rfc7950 / stmt / grouping / AbstractGroupingStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/grouping/AbstractGroupingStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/grouping/AbstractGroupingStatementSupport.java
index 636585871a4353bf956be49e40742abb474d3dc0..e08b5afd0620621e055740d9f74db8b19e8a18a1 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/grouping/AbstractGroupingStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/grouping/AbstractGroupingStatementSupport.java
@@ -16,6 +16,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.GroupingEffectiveStatement
 import org.opendaylight.yangtools.yang.model.api.stmt.GroupingStatement;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseQNameStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.GroupingNamespace;
+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.StmtContext.Mutable;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils;
@@ -62,18 +63,10 @@ abstract class AbstractGroupingStatementSupport
     }
 
     @Override
-    protected final GroupingEffectiveStatement createEffective(
-            final StmtContext<QName, GroupingStatement, GroupingEffectiveStatement> ctx,
-            final GroupingStatement declared, final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-        return new GroupingEffectiveStatementImpl(declared, ctx, substatements,
-            historyAndStatusFlags(ctx, substatements));
-    }
-
-    @Override
-    protected GroupingEffectiveStatement createEmptyEffective(
-            final StmtContext<QName, GroupingStatement, GroupingEffectiveStatement> ctx,
-            final GroupingStatement declared) {
-        return createEffective(ctx, declared, ImmutableList.of());
+    protected GroupingEffectiveStatement createEffective(final Current<QName, GroupingStatement> stmt,
+            final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+        return new GroupingEffectiveStatementImpl(stmt.declared(), substatements, stmt.sourceReference(),
+            historyAndStatusFlags(stmt.history(), substatements), stmt.getSchemaPath());
     }
 
     private static void checkDeclaredConflict(final StmtContext<QName, ?, ?> ctx) {